second commit, 160814 1920
Merge branch 'master' of https://github.com/tohweizhong/redhyte

Conflicts:
	server.R