Merge branch 'master' of https://github.com/Proxmark/proxmark3

.gitignore

@@ -20,11 +20,14 @@ lua
 luac
 
 fpga/*
-!fpga/fpga.bit
+!fpga/tests
+!fpga/fpga_lf.bit
+!fpga/fpga_hf.bit
 !fpga/*.v
 !fpga/Makefile
 !fpga/fpga.ucf
-!fpga/xst.scr
+!fpga/xst_lf.scr
+!fpga/xst_hf.scr
 !fpga/go.bat
 !fpga/sim.tcl