Add a StaticPages Controller
Finish static pages
workspace
Merge branch 'static-pages'

Conflicts:
	.idea/workspace.xml
	app/views/layouts/application.html.erb