views added: fun & quiz
Merge branch 'master' of github.com:szemek/fishki

Conflicts:
	app/controllers/welcome_controller.rb
	config/routes.rb