Edited line
Merge branch 'master' of https://github.com/daveogle/example into Andy_test_branch

Conflicts:
	Test.txt