Lots of changes
Merge branch 'master' of https://github.com/rmccampbell/GhostHunter

Conflicts:
	GhostHunter/src/edu/virginia/cs2110/rnm6u/ghosthunter/GameActivity.java
	GhostHunter/src/edu/virginia/cs2110/rnm6u/ghosthunter/GameView.java