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

Conflicts:
	CNAME