Merge pull request #4 from xiaoqin2012/master

merge from xiaoqin
minor changes
Merge branch 'master' of https://github.com/piaw/nutrition1

Conflicts:
	NutritionTracker/NutritionTracker/app/src/main/java/net/tigerparents/nut/NutritionData.java
	NutritionTracker/NutritionTracker/app/src/main/java/net/tigerparents/nut/PersonProfile.java
Added weight unit
Added Enter User Data.
TODO: make startscreen check for user data. If it doesn't already exist, immediately go to the enteruserdata screen.
Merge pull request #9 from piaw/master

Added weight units to the nutrition display screen. Also added enter user profile screen.