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

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.md
	Rakefile
	app/assets/stylesheets/application.css
	bin/rails
	bin/rake
	config/application.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/mime_types.rb
	config/initializers/session_store.rb
	config/routes.rb
	public/404.html
	public/422.html
	public/500.html
	spec/requests/static_pages_spec.rb