Calorie計算ロジック追加
Merge remote-tracking branch 'upstream/development' into NewCustomView
設定画面修正
Merge pull request #49 from ykyouhei/NewCustomView

Calorie計算ロジック追加
Merge branch 'development' of https://github.com/tochiba/StarbucksCustomOrder into dev_k