changed routes
Merge branch 'master' of https://github.com/alexandru-paduraru/razaboi

Conflicts:
	app/views/game/play.html.erb
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/pids/server.pid
merged