blog shifted
Merge branch 'master' of https://github.com/tanuj-b/marketing-site

Conflicts:
	index.php