Initial Commit
Merge branch 'master' of https://github.com/12preschph/demo_app

Conflicts:
	Gemfile
	Gemfile.lock
	bin/bundle
	bin/rails
	bin/rake
	config/initializers/secret_token.rb