change 2
Merge branch 'master' of https://github.com/TrevRawr/test

Conflicts:
	test.txt