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

diff --combined .gitignore
index 97862aaa58823a6795e11cc813fae177743d61c7,ea93d61f674061c741675128472a807978a71b81..a12a5c43fb3fe2e4cccf97cd995aac60fb80166a
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,6 +1,7 @@@
  # .gitignore
  # don't push these files to the repository
  
 +*.log
  *.o
  *.a
  *.d
@@@ -20,11 -19,14 +20,14 @@@ lu
  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