commit after change
Merge branch 'master' of https://github.com/vijcbe/gitstudyt

Conflicts:
	test1.txt