showing (food, weight) nutrition values
Merge remote-tracking branch 'origin/master'

Conflicts:
	NutritionTracker/NutritionTracker/app/src/main/java/net/tigerparents/nut/DataBaseHelper.java
Merge branch 'master' of https://github.com/xiaoqin2012/nutrition1
Moved files around
Fixed NutritionData
Try to do ShowReports
Fixed Show Reports