Merge remote-tracking branch 'upstream/master'
end of lesson - working calculator
Homework Task - Calculator
Merge pull request #25 from samuel-hill/master

homework