some cool stuff
Merge branch 'master' of https://github.com/benskuhn/CS262

Conflicts:
	atmPython/server/log.txt
	atmPython/server/myServerSend.py
Merge branch 'master' of https://github.com/benskuhn/CS262