外観修正
Merge remote-tracking branch 'upstream/development' into NewCustomView
PriceDic作成
価格計算ロジック追加
Merge pull request #47 from ykyouhei/NewCustomView

価格計算ロジック追加
PriceDic,calorieDic作成
PriceDic,calorieDic作成
Merge remote-tracking branch 'origin/development' into development
Merge pull request #48 from kyanai/dev_k

Add photo
mod matrix data