I don't even remember
Merge remote-tracking branch 'origin/master'

Conflicts:
	GhostHunter17/src/edu/virginia/cs2110/ghosthunter17/GameView.java