Added Goal and Ingredient class has new attribute
Merge remote-tracking branch 'origin/master'

Conflicts:
	Peckish Project/src/aiti/mit/sa/peckish/classes/Ingredient.java
	
	Removed and Added Ingredients
Added and Removed Ingredient class