#
Merge branch 'master' of https://github.com/vanhoofseppe/firstmodel
OK
Changing Questions form
Merge branch 'master' of https://github.com/vanhoofseppe/firstmodel

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	config/routes.rb
Change of mike (I dont know what)