hw6 commits... finally
Merge branch 'master' of https://github.com/alvareap/classwork