Will create merge conflict repo 2
Merge branch 'master' of github.com:ChasManRors/repo01

whatever
Merge branch 'master' of github.com:ChasManRors/repo01

Conflicts:
	mergeconflict1.txt
	mergeconflict2.txt
	mergeconflict3.txt
just working towards a mergetool I understand
Will create merge conflict 2