Initial commit
Merge branch 'master' of https://github.com/noelanthony/demo_app

Conflicts:
	config/initializers/secret_token.rb
Kestrel