Local Committ
Merge branch 'master' of
https://github.com/DrWhatsisname/CS2110-Ghost-Hunter-Group-17.git

Conflicts:
	GhostHunter17/bin/GhostHunter17.apk
	GhostHunter17/bin/classes.dex
	GhostHunter17/bin/resources.ap_
Merge branch 'master' of
https://github.com/DrWhatsisname/CS2110-Ghost-Hunter-Group-17.git

Conflicts:
	GhostHunter17/bin/GhostHunter17.apk
	GhostHunter17/bin/classes.dex
	GhostHunter17/bin/dexedLibs/android-support-v4-4b1526e6e4fb256195eee4bf724062f3.jar
	GhostHunter17/bin/resources.ap_