Small fixes
Small fixes
Merge branch 'master' of github.com:KyleAMathews/blog
Merge branch 'master' of github.com:KyleAMathews/blog

Conflicts:
	public/atom.xml
	public/index.html
Merge branch 'master' of github.com:KyleAMathews/blog

Conflicts:
	public/atom.xml