windows commits
Merge branch 'master' of https://github.com/sigurdpl/testRepo

Conflicts:
	test.txt