save money and kills
Merge remote-tracking branch 'origin/master'

Conflicts:
	GhostHunter/src/edu/virginia/cs2110/rnm6u/ghosthunter/GameView.java
Merge branch 'master' of https://github.com/rmccampbell/GhostHunter