Initial commit
Merge branch 'master' of https://github.com/Alanah/demo_app

Conflicts:
	README.rdoc
	Rakefile
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	config/application.rb
	config/boot.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/inflections.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	public/404.html
	public/422.html
	public/500.html
	public/robots.txt
	test/test_helper.rb

	modified:   README.rdoc
	modified:   Rakefile
	modified:   app/assets/javascripts/application.js
	modified:   app/controllers/application_controller.rb
	new file:   app/controllers/concerns/.keep
	new file:   app/mailers/.keep
	new file:   app/models/.keep
	new file:   app/models/concerns/.keep
	modified:   app/views/layouts/application.html.erb
	new file:   bin/bundle
	new file:   bin/rails
	new file:   bin/rake
	modified:   config/application.rb
	modified:   config/boot.rb
	modified:   config/environment.rb
	modified:   config/environments/development.rb
	modified:   config/environments/production.rb
	modified:   config/environments/test.rb
	new file:   config/initializers/filter_parameter_logging.rb
	modified:   config/initializers/inflections.rb
	modified:   config/initializers/secret_token.rb
	modified:   config/initializers/session_store.rb
	modified:   config/initializers/wrap_parameters.rb
	modified:   config/locales/en.yml
	modified:   config/routes.rb
	new file:   lib/assets/.keep
	new file:   lib/tasks/.keep
	new file:   log/.keep
	modified:   public/404.html
	modified:   public/422.html
	modified:   public/500.html
	modified:   public/robots.txt
	new file:   test/controllers/.keep
	new file:   test/fixtures/.keep
	new file:   test/helpers/.keep
	new file:   test/integration/.keep
	new file:   test/mailers/.keep
	new file:   test/models/.keep
	modified:   test/test_helper.rb
	new file:   vendor/assets/javascripts/.keep
	new file:   vendor/assets/stylesheets/.keep