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

Conflicts:
	.secret
	config/initializers/secret_token.rb