cleaning up errors from latest push
commented out an unneeded method in game.rb
fixing merge conflict
precompile before deploy
cleaned up some temp files left during merging
fixed merge conflict and pushing