updated paperclip to version 4.1
resolved gemfile conflict
merge from develop
game new page now creates game objects from params, added migration for level column in games
game new page now creates game objects from params, added migration for level column in games
merging from develop
merged