Updated buttons on leave a tip page
Fixed conflicts
Merge branch 'master' of https://github.com/sabw8217/TipBucket