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

Conflicts:
	testt.txt