static pages create
finish static pages
Merge branch 'master' into add-static-pages

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
resolve merge conflicts