user model
game model, associations for user and game
update with changes made to master
Merge pull request #16 from SpraggleRock/users

Users