Try again
Merge branch 'master' of https://github.com/tusharmath/tusharm.com

Conflicts:
	.travis.yml