Add a StaticPages controller
Static Pages Update
Application Changs
Merge branch 'static-pages'

Conflicts:
	app/views/layouts/application.html.erb
Finish layout and routes