my failed first attempt to implement hw7
Merge branch 'master' into hw7

Conflicts:
	ChangeLog
	img.jpg
	server.py