week 4 materials
To commit changes to calculator.rb
to conclude merge
Merge remote-tracking branch 'upstream/master'

To get week 4