Fixed errors wiht mercury
Merge branch 'master' of https://github.com/TomDAlba/WorkingTitle

Conflicts:
	blog/public/robots.txt