initial commit
Merge branch 'master' of https://github.com/alucero270/demo_app

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb
	config/routes.rb