did my homework
Merge branch 'master' of http://github.com/epoch/wdi_sydney_2_hw
homework submission
Merge pull request #7 from mthees7/master

Homework from d02 -- Calculator