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
fix merge conflicts
fix more merge conflicts
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
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.
Fix homepage css.
Fix styling for devise items.
Merge pull request #114 from cassiemoy/master

Styling for homepage and devise items.