committing
Merge branch 'master' of github.com:afehr/git-workshop-notes

Conflicts:
	date2.txt