Commented out individual timelines, reset button resets sim
Merge branch 'master' of https://gons/Grand-Haven-Musical-Fountain

Conflicts:
	Choreography_Dev/src/choreography/view/ChoreographyController.java
	Choreography_Dev/src/choreography/view/timeline/Timeline.java
Merge branch 'master' of https://github.com/ExcaliburSolutions/Grand-Haven-Musical-Fountain