Eliminated previous aws version
Merge branch 'feature' into develop
Added game timer to game.js.erb file
Merge branch 'feature' into develop