Merge branch 'hw3'
fake commit
hw8
forgot to commit
Merge pull request #52 from salomanders/hw

hw8