inserted 2nd sentence in 2nd paragraph
Merge branch 'master' of https://github.com/smc322/myfirstgit

this is our method for fixing our conflicts, got this resolved from my other version

Conflicts:
	firstfile.txt