finished conversations View and Control, cannot test because actors are not yet placed in map locations
finished conversations View and Control, cannot test because actors are not yet placed in map locations
Merge origin/master

Conflicts:
	AMedievalHarvestFestival/src/byui/cit260/aMedievalHarvestFestival/control/GameControl.java
	AMedievalHarvestFestival/src/byui/cit260/aMedievalHarvestFestival/control/LocationControl.java
	AMedievalHarvestFestival/src/byui/cit260/aMedievalHarvestFestival/view/GameMenuView.java
	AMedievalHarvestFestival/src/byui/cit260/aMedievalHarvestFestival/view/LocationView.java