Hw 7 initial
Merge branch 'master' of github.com:octopusgarden/octopuslab