aqs;dlkfj
Merge branch 'master' of http://github.com/MikeCook9994/gitTutorial

Conflicts:
	mymerge.txt