change game model
deleted unessesary views
Merge remote-tracking branch 'origin' into develop
Got carrierwave working
Merge branch 'develop' of https://github.com/caldwelljs/makerpong into develop