icon bgs
Merge branch 'master' of https://github.com/dreamerlilly/DailyServings

Conflicts:
	DailyServings/DailyServings/Resources/Bread.png
	DailyServings/DailyServings/Resources/Dairy.png
	DailyServings/DailyServings/Resources/Fruit.png
	DailyServings/DailyServings/Resources/Protein.png
	DailyServings/DailyServings/Resources/Vegetable.png