update
Merge branch 'master' of https://github.com/camo1018/GTMRS

Conflicts:
	server.js