ignore
changed top line
Merge branch 'master' of github.com:ClearCarbon/GitTeaching
change line 2
Merge branch 'master' of github.com:ClearCarbon/GitTeaching

Conflicts:
	text.txt