Jackie - push
Merge branch 'master' of https://github.com/resh2302/FridgeApp

Conflicts:
	fridgeApp/fridge-tracker-php/css/main.css
	fridgeApp/fridge-tracker-php/myRefrigerator.php
Jackie github made me