Updates in response to feedback on Assign 1 and 2
Merge pull request #245 from esedenberg/master

Updates in response to feedback on Assign 1 and 2