pull in the latest changes before hw 4
add assignment 4, turnin