Merging work between server and desktop
Merge branch 'master' of https://github.com/waiteb3/home-server

Conflicts:
	server.go