finished Hw7
finished hw5
Merge pull request #61 from salomanders/hw

finished Hw7