added line of text

just learning how to use this. i added a sentence. thank you thank you.
fixing a merge conflict

combined casey, lee and scott's additions
Merge branch 'master' of https://github.com/SFPC/Git-study

Conflicts:
	yo.txt