Made another test file, tested branches
Merge branch 'master' into test1

Conflicts:
	test.txt (fixed)