Don't specify port
Update
Merge branch 'master' of https://github.com/alanhdu/hunt

Conflicts:
	server.py