merge
Merge branch 'master' of https://github.com/hicklin-james/fooddiary

Conflicts:
	FoodDiary/FDiPhone.storyboard