put it all together
Merge branch 'master' of github.com:afischer/SoftDev_HW01