Tim's first commit.
Merge branch 'master' of github.com:imvarda/TempTest

Conflicts:
	test.txt