++
Merge branch 'master' of https://github.com/ReliQ/FirstTipCalc.git