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

Conflicts:
	CNAME