g
erzi
Merge branches 'master' and 'master' of https://github.com/lozy219/sharedThings

Conflicts:
	config.js
	config_node.js
	sharedThingsServer.js
Merge branch 'master' of https://github.com/lozy219/sharedThings

Conflicts:
	index.html
	sharedThingsServer.js