usr1
Merge branch 'master' of https://github.com/corgiTrax/gitTest

Conflicts:
	myFile.py