Merge branch 'master' into janice_style
Blog posts added and styled
Merge branch 'master' into janice_style

Conflicts:
	app/assets/stylesheets/application.css.scss
Minor edits to footer and header; README updated; Work Summary doc created.
Merge branch 'janice_style'

Conflicts:
	app/assets/stylesheets/application.css.scss