Amelioration du README
Merge branch 'master' of https://github.com/vaevictis333/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	README.rdoc
	config/application.rb
	config/initializers/secret_token.rb