combine form and calendar
Merge branch 'master' of http://github.com/danny2000tw/Calorie-tracker