...
Merge branch 'master' of https://github.com/williamstein/480-ent-2014

Conflicts:
	lectures/2014-01-08.sagews
Merge branch 'master' of https://github.com/williamstein/480-ent-2014
update based on actual lecture