Initial commit
Improve the README
Add a StaticPages controller
Finish static pages
Finish static pages
Merge branch 'master' of https://github.com/jorge-salazar/sample_app

Conflicts:
	Gemfile
	app/views/layouts/application.html.erb
	config/routes.rb
	spec/spec_helper.rb