Remove Hello World page
Add a StaticPages controller
Finish static pages
Merge branch 'master' of github.com:jh24/sample_app

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

:wkbq