finished hw3
Merge pull request #2 from joshshadik/hw3

finished hw3