attempting to solve platform speed issue
Merge branch 'master' into dev_nick
Merge branch 'master' into dev_nick
Add gems
discarded some unnecessary gems
fixing merge conflicts to get merge back to master branch
fixing yield issue
Merge branch 'master' into dev_nick

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	app/views/statics/game.html.erb
	scrap/_header.html.erb
saving Gemfile
fix min scores
Merge branch 'master' into dev_nick

Conflicts:
	app/views/layouts/application.html.erb

  keep my changes