changes during class (?)
Merge branch 'master' of https://github.com/williamstein/sage2014
playing around
Merge branch 'master' of https://github.com/williamstein/sage2014

Conflicts:
	lectures/2014-04-09/2014-04-09.sagews
Merge branch 'master' of https://github.com/williamstein/sage2014