Last commit before presentation

All edits and changes from Sunday night are here.