Merge pull request #6 from piaw/master

Create Nutrition Information Display Screen
update assets/food.db
update assets/food.db
Merge remote-tracking branch 'origin/master'
update assets/food.db
done with nutritiondata
done with nutritiondata
Merge pull request #7 from piaw/master

enterMoreData button brings you back to FoodEntry
Merge pull request #3 from xiaoqin2012/master

merge from xiaoqin