before combine form
Merge branch 'master' of https://github.com/danny2000tw/Calorie-tracker

Conflicts:
	server.js