Initial commit
Merge branch 'master' of github.com:corentindepagne/first_app

Conflicts:
	Gemfile
	Gemfile.lock
	bin/bundle
	bin/rails
	bin/rake
	config/secrets.yml