updated sim
Merge branch 'master' of https://github.com/ExcaliburSolutions/Grand-Haven-Musical-Fountain

Conflicts:
	Choreography_Dev/src/choreography/view/music/MusicPaneController.java
	Choreography_Dev/src/choreography/view/sim/FountainSimController.java