Merge branch 'server' of github.com:man1utdfan/RemoteHealthcare into server

Conflicts:
	Remote Healthcare/Server/Server.csproj
"fixed" it.