Tip calculator one and 2
Merge https://github.com/tjperry07/thinkful