commit for conflict
Merge branch 'master' of https://github.com/samodi/test

Conflicts:
	Test2.txt