commit 12/11/14

after last lecture