unbroke collision detection
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git
Merge branch 'ParkPacManGhost'
Finished code, but I cannot pull from master branch since there is an
error.