Edit 5
fdg
Merge branch 'master' of https://github.com/ksirmons/Test

Conflicts:
	Test2.txt