Versuch devise einzubinden
merge conflicts
Merge branch '131110_al_devise' of github.com:HuldaLa/we_are_many into 131110_al_devise

Conflicts:
	Gemfile.lock
	app/models/user.rb
	app/views/users/index.html.haml