ohisa
Merge branch 'master' of github.com:irumisu/tourmaline

Conflicts:
	app/controllers/enquetes_controller.rb
	app/views/enquetes/view.html.erb
Merge branch 'master' of github.com:irumisu/tourmaline