Sensor
Merge branch 'master' of https://github.com/Daniel-Hoerauf/Ghost-Hunter

Conflicts:
	GhostHunter/bin/GhostHunter.apk
	GhostHunter/bin/classes.dex
	GhostHunter/bin/classes/uva/cs2110/ghosthunter/MainGame.class
	GhostHunter/bin/resources.ap_
	GhostHunter/src/uva/cs2110/ghosthunter/MainGame.java