doing work on the surgery view controller
Merge remote-tracking branch 'origin/master'
fixed some method calls and comments