users js got rid of error on console
Merge branch 'master' into game_logic
Merge pull request #56 from pocket-gophers-2014/game_logic

Game logic