welcome#index
Merge branch 'master' of https://github.com/gentiliniluca/Indovina_Zoo

Conflicts:
	app/models/question.rb
	config/routes.rb