merge
Merge branch 'master' of https://github.com/stuckata/tests

Conflicts:
	GitTest.txt