Initial commit
Sign in with GitHub (WIP)
Merge branch 'master' of https://github.com/olimart/loyer

Conflicts:
	app/controllers/settings_controller.rb
	app/views/passwords/edit.html.erb
	app/views/user_mailer/reset_password_email.html.erb