asdf
Merge branch 'b2' of https://github.com/tombl/LearningGit into b2

Conflicts:
	junk.txt