Prova...
Merge branch 'master' of https://github.com/gentiliniluca/Indovina_Zoo
Versione finale. :)
Merge branch 'master' of https://github.com/gentiliniluca/Indovina_Zoo

Conflicts:
	app/views/game/play.html.erb
	app/views/game/result.html.erb