commit 09/30/14

after 4th lecture