Merge branch 'master' of https://github.com/jcyoder/NewKitchen

Conflicts:
	KitchenStyles.css