Copied Latest Files To Local
Merge branch 'master' of https://github.com/qqpham/tip-calculator

Conflicts:
	.DS_Store
	www/im/.DS_Store
	www/im/person-icon.png