collaboration server
signalR version updated
gitignore
sollaboration server, and clean up
merge
Working version
Loading same image from web server on both clients
Fixed bug where client would handle its own messages
Merge branch 'Load_Same_Image'

Conflicts:
	MacEditor/MacEditor.csproj
	MacEditor/MainWindowController.cs
	MacEditor/packages.config
fix broken stuff from merge