completed HoldFestivalPanel and PlayerPanel
merging with master
still working on Holding Festival minigame
updates
Merge branch 'model'

Conflicts:
	src/Models/Actions/MActions/SelectOneSpaceTileAction.java
	src/Models/Actions/MActions/SelectPalaceTileAction.java
	src/Models/Actions/MActions/SelectTwoTileAction.java
Merge branch 'master' into controller

Conflicts:
	src/Models/GameModel.java
	src/Models/JavaPlayer.java