Second commit
Merge branch 'master' of github.com:sjlbos/git-workshop-notes

Conflicts:
	date1.txt