tried to fix collision with platforms
delete files in order to fix merge conflicts
delete travisCI for now because we are not using it at all
fixed merge conflicts
add day 4 of final project group adventures
clean up Gemfile in order to know which gems we need and don't need
fixed merge conflicts with teleportation fix
require paloma gem in order to require the javascript for only the game rooms
require paloma in the application js file in order to use the gem'
remove gem that wasn't needed anymore
require game and chat only in the game room
refactored game file in order for firebase to work
fix application.js merge conflict
Merge pull request #50 from juljun14/master

Fix game to only show when user enters game room
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
Revert "Fix game to only show when user enters game room"
Merge pull request #52 from red-spotted-newts-2014/revert-50-master

Revert "Fix game to only show when user enters game room"
Merge remote-tracking branch 'upstream/master'
delete unnecessary comments on top of file
change firebase.js required file to reflect the folder structure change