Initial commit
Finish demo app
Merge branch 'master' of https://github.com/lancelot11/arondight

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	bin/spring
	config/application.rb
	config/initializers/session_store.rb
	config/routes.rb
	config/secrets.yml