windows
 Merge branch 'master' of https://github.com/wesker-job/gittest

Conflicts:
	test.txt