merging
merge
merge
Merge branch 'master' of github.com:danny2000tw/Calorie-tracker

Conflicts:
	css/styleloginsupport.css