Merge branch 'master' of github.com:goper/seo-tag.loc

Conflicts:
	robots.txt
Merge branch 'master' of github.com:goper/seo-tag.loc