Codebase cleanup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	.ruby-version
	Gemfile
	Gemfile.lock
	db/schema.rb
	db/seeds.rb
	spec/models/game_spec.rb