Um a template thing, prettier
Merge remote-tracking branch 'upstream/master'

Conflicts:
	_layouts/post.html
Merge pull request #1 from eelsjack/master

Template Design