socket on server and html client
Merge branch 'master' of https://github.com/thinkcopter/thinkCopter

Conflicts:
	public/index.html