Merge pull request #9 from piaw/master

Added weight units to the nutrition display screen. Also added enter user profile screen.
showing (food, weight) nutrition values
Merge pull request #5 from xiaoqin2012/master

merge from xiaoqin