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

Conflicts:
	CNAME
	README.md
	index.html