back (ish)
Merge branch 'master' of https://github.com/sampaisley/sampaisley.github.io

Conflicts:
	index.html