Added StaticPages controller with `rails g controller StaticPages home help --no-test-framework`
Merge branch 'static-pages'

Conflicts:
	app/controllers/static_pages_controller.rb