upate
authentication
Merge branch 'master' of github.com:danny2000tw/Calorie-tracker

Conflicts:
	css/style.css
	server.js