Add static pages
Merge branch 'static-pages'
Merge branch 'master' of https://github.com/tabosque/sample_app

Conflicts:
	Gemfile.lock
	app/views/static_pages/about.html.erb
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
	spec/requests/static_pages_spec.rb