second date file
Merge branch 'master' of github.com:sdiemert/git-workshop-notes

Conflicts:
	date.txt