Merge branch 'master' of github.com:zmarkan/StringCalculatorKata