db
Merge branch 'master' of https://github.com/caliber01/QR-Map.git

Conflicts:
	QR-Map/src/com/example/qr_map/Activities/MainActivity.java
Merge branch 'master' of https://github.com/caliber01/QR-Map
sponsor