Merge branch 'master' of https://github.com/goper/git.loc

Conflicts:
	666.txt
Merge branch 'master' of https://github.com/goper/git.loc