Merge branch 'master' of https://github.com/mannro/mannro.github.io

Conflicts:
	CNAME
Merge branch 'master' of https://github.com/mannro/mannro.github.io
cname