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

Conflicts:
	GhostHunter/bin/classes/uva/cs2110/ghosthunter/MainActivity.class
	GhostHunter/bin/classes/uva/cs2110/ghosthunter/MainGame.class
	GhostHunter/src/uva/cs2110/ghosthunter/MainActivity.java