grammar
Merge branch 'master' of github.com:dougblack/dougblack.io

Conflicts:
	markdown/metaclasses.md
typo