mmh
Merge branch 'master' of https://github.com/mmbash/mops.io
local changes to config.js
Merge branch 'master' of https://github.com/mmbash/mops.io

Conflicts:
	config.js
add some docker functionality to the server