Updating
Merge branch 'master' of https://github.com/hedunky/sails-ho

Conflicts:
	Client/network.js
	server/sailshogame.js
	server/server.js
Updated port