Add static pages
Merge remote-tracking branch 'origin/static_pages' into static_pages

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