Formatting and fixes
Merge branch 'master' of https://github.com/Caitria/pocketknife_site

Conflicts:
	blog/index.html
Merge branch 'master' of https://github.com/Caitria/pocketknife_site

Conflicts:
	blog/index.html