Added GPS to maps and checkmarks.
Merge branch 'master' of https://github.com/CHSK/maps

Conflicts:
	CHSK/bin/CHSK.apk
	CHSK/bin/R.txt
	CHSK/bin/classes.dex
	CHSK/bin/classes/com/example/chsk/CheckActivity.class
	CHSK/bin/classes/com/example/chsk/LoginActivity.class
	CHSK/bin/classes/com/example/chsk/Quest1.class
	CHSK/bin/classes/com/example/chsk/Quest2.class
	CHSK/bin/classes/com/example/chsk/Quest3.class
	CHSK/bin/classes/com/example/chsk/R$drawable.class
	CHSK/bin/classes/com/example/chsk/R$id.class
	CHSK/bin/classes/com/example/chsk/R$integer.class
	CHSK/bin/classes/com/example/chsk/R$layout.class
	CHSK/bin/classes/com/example/chsk/R$menu.class
	CHSK/bin/classes/com/example/chsk/R$string.class
	CHSK/bin/classes/com/example/chsk/R$style.class
	CHSK/bin/classes/com/example/chsk/R$styleable.class
	CHSK/bin/dexedLibs/appcompat_v7-18dad4e64e669dda862bbe4b97c3dae3.jar

CHSK/bin/dexedLibs/google-play-services_lib-7509cef7567f197b48be64518e2c
424e.jar
	CHSK/bin/resources.ap_
	CHSK/gen/com/example/chsk/R.java
	CHSK/res/drawable/logo.png
	CHSK/res/drawable/rectangle.xml
	CHSK/res/layout/fragment_login.xml