navbar fix
bin commit
fix
untracking
Merge branch 'master' of https://github.com/caliber01/QR-Map.git

Conflicts:
	QR-Map/bin/R.txt
	QR-Map/gen/android/support/v7/cardview/R.java
Merge branch 'master' of https://github.com/caliber01/QR-Map.git