My commit 1
Merge branch 'master' of github.com:enrique7mc/demo_app

Conflicts:
	.gitignore
	README.rdoc
	Rakefile
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	config.ru
	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