Editted Test Conflict
Merge branch 'master' of https://github.com/CalZoneVUB/TestRepo

Conflicts:
	Test1.txt
Merge pull request #3 from Timbo925/master

Editted Test Conflict