getting ready for mergfe
'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb
I don't know
Merge branch 'master' of https://github.com/toneill818/Game

Conflicts:
	config/routes.rb