try this conflict
Merge branch 'master' of https://github.com/lxms/fiddlefaddle

Conflicts:
	makemyday.txt