asd123
asdasd
asd
ge branch 'master' of github.com:colsond/git-workshop-notes

Conflicts:
	date2.txt

sdfasd