Added services to desktop
Merge branch 'master' of github.com:amracks/scripts

Conflicts:
	Desktop.sh
Machine Setup Scripts