assignment 4
commit for assignment 5
Merge pull request #1 from sccouch/inclass

Inclass