Updates 2
Merge branch 'master' of https://github.com/CadillacMan/Test2
Merge branch 'master' of https://github.com/CadillacMan/Test2

Conflicts:
	test.txt

Resolved leave mine!