Clients autoconnect to server, removed connect.
Merge branch 'master' into jason

Conflicts:
	public/scripts/client.js
Merge branch 'master' into jason