Inital Commit
done with the demo app
^0
o
Merge https://github.com/Jkoch07/demo_app

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/views/layouts/application.html.erb
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb

^O
^x
x