update
Merge branch 'master' of https://github.com/ericpriceco/ericpriceco.github.io

Conflicts:
	_layouts/blogpost.html
	stylesheets/style.css