My stuff
Merge branch 'master' of https://github.com/dreamerlilly/DailyServings

Conflicts:
	DailyServings/DailyServings.xcodeproj/project.pbxproj