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

Conflicts:
	CNAME