Tip calculator v4 3rd try
Merge remote-tracking branch 'origin/master'