first commit
Merge branch 'master' of https://github.com/tigenie/demo_app

Conflicts:
	config/initializers/secret_token.rb