Merge pull request #12 from jontsai/master

merging to master
added TipCalculator