finished hw 6
Merge branch 'master' of github.com:ibebrett/cs344