server
Merge branch 'master' of https://github.com/jkatsnelson/mosaic

Conflicts:
	client/mosaic.html
Merge branch 'master' of https://github.com/jkatsnelson/mosaic