blog and services pages
Merge branch 'master' of github.com:aipdx-wdim351/wdim351-team-4

Conflicts:
	class_07/sass/app.scss
	class_07/stylesheets/app.css