the desired change in desktop
Merge branch 'master' of https://github.com/mec345/myfirstgit

Conflicts:
	draft.txt
back on the main branch...oh well