added Adam as an editor
added super inheritance
Added code to pull from super-class

Merge origin/master

Conflicts:
	aMedievalHarvestFestival/src/byui/cit260/aMedievalHarvestFestival/model/FoodItem.java
Added code to pull from super-class

Merge origin/master

Conflicts:
	aMedievalHarvestFestival/src/byui/cit260/aMedievalHarvestFestival/model/FoodItem.java