hw6
Merge https://github.com/sdorlik/Sam_IS445