projet de base, rails
Merge branch 'master' of https://github.com/Joluma/blog

Conflicts:
	app/views/layouts/application.html.erb
	config/application.rb
	config/initializers/session_store.rb
	config/secrets.yml