Merge
Merge branch 'master' of github.com:PC2R/iSketch

Conflicts:
	Server/server.ml
Merge branch 'master' of github.com:PC2R/iSketch

Conflicts: