full
Merge branch 'master' of https://github.com/smclrk/smclrk.github.io

Conflicts:
	blog/index.html