fix about us and instructions
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
remove url modal and add it to confirmP1 modal, also add waiting for player 2 modal
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
fix merge conflict
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
change Desert with a capital D to lowercase to match heroku
Merge pull request #109 from juljun14/master

change Desert with a capital D to lowercase to match heroku
Merge pull request #110 from cassiemoy/master

Fix pause; debug selective modals.
change apple location in order for hero to obtain it
fix merge conflicts
Merge pull request #111 from juljun14/master

change apple location in order for hero to obtain it
fix more merge conflicts
move slowDown powerUp to a better location
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
Merge pull request #112 from juljun14/master

move slowDown powerUp to a better location
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
Merge pull request #113 from rootulp/master

about us and instructions
Commit before merging.
Fix merge conflicts.