Remove calculator.glade file that is to be created in the workshop
Merge remote-tracking branch 'origin/master'