Random binaries again
Merge branch 'master' of
https://github.com/DrWhatsisname/CS2110-Ghost-Hunter-Group-17.git

Conflicts:
	GhostHunter17/bin/GhostHunter17.apk
	GhostHunter17/bin/resources.ap_
Ignoring things