annoy johannes
Merge branch 'master' of github.com:rosario-raulin/shiny-rainbow

Conflicts:
	app/views/devise/registrations/new.html.erb