new post and new draft
new build
Merge branch 'master' of github-ohbadiah:ohbadiah/nickmcavoy-dotcom

Conflicts:
	blog/_site/archive.html
	blog/_site/atom.xml