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

Conflicts:
	media/files/seoresult.json
Merge branch 'master' of github.com:goper/seo-tag.loc

Conflicts:
	media/files/seoresult.json