change to Daylen
Merge branch 'master' of https://github.com/daylen/git-ws-testing

Conflicts:
	test.py