Nick’s code and other stuff
Merge branch 'master' of https://github.com/ExcaliburSolutions/Grand-Haven-Musical-Fountain

Conflicts:
	Choreography_Dev/src/choreography/view/timeline/TimelineController.java