Edit git

file is edit
Merge branch 'master' of https://github.com/Thodd00572/thodd-hello-git

Conflicts:
	Test.rtf