lhsdad
Merge branch 'master' of https://github.com/josephcoombes/git-mania

Conflicts:
	git-mania/test2.txt