Initial commit
Improve the README
Merge branch 'master' of https://github.com/alucero270/sample_app

Conflicts:
	.secret
	Gemfile
	README.md
	config/application.rb
	config/initializers/secret_token.rb