crazy-new-experiment.txt - changes made before merge of master which I know to be different
Merge branch 'master' of https://github.com/mojorisin7/git-knowledge

Conflicts:
	crazy-new-experiment.txt
Conflicts resolved