another step
xMerge branch 'master' of github.com:lmoehn/July17

Conflicts:
	me.txt