Finished history
Merge branch 'master' of https://github.com/fredcallaway/hci

Conflicts:
	python/graphics.py