Added commenting
Merge branch 'master' of https://github.com/elake/assignment3

Conflicts:
	server.py