JS update
Merge branch 'master' of https://github.com/qqpham/tip-calculator

Conflicts:
	.DS_Store