add P and R for pause and resume into instructions
Merge remote-tracking branch 'upstream/master'
pause game until player 2 enters room
delete comments of ghost 2-4
refactor characterMove
delete old characters function
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
map collisions now work
delete commented out lines to fix merge conflict
Merge pull request #76 from dabeeya/master

map collisions work with tile map editor
create apples instead of diamonds
commit file before merging
fixing main.js file in order to merge latest change from master
add about us information with link to github repository
Merge pull request #77 from juljun14/master

Add about us page
refresh page on game over and put ghost in random location and put pacman in center
put pacman in center and ghost in random location and delete ghosts 2-4
fix merge conflict
remove link to our github because the link because white and can't see it for now
Merge pull request #78 from juljun14/master

remove link to our github because the link because white and can't see it