make pretty
Merge branch 'master' of github.com:edunham/netsec-class

Conflicts:
	presentation.rst