Original rails app
Merge branch 'master' of github.com:Hunk13/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	config.ru
	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
Finish demo app_/home/rails