Anh asked for this
Merge branch 'master' of
https://github.com/AnhOnymous/GhostHunterGame.git

Conflicts:
	src/edu/virginia/cs2110/ghosthuntergame/Ghost.java
Merge branch 'master' of
https://github.com/AnhOnymous/GhostHunterGame.git

Conflicts:
	src/edu/virginia/cs2110/ghosthuntergame/Ghost.java