Confirmed working code

Sweeps still misbehave. Some FCWs fail getting lag. Prettied Strings!
Color Palette buttons are back! Whoo!
Updated Sweeps Movement
Merge branch 'Choreography_Test' of https://github.com/ExcaliburSolutions/Grand-Haven-Musical-Fountain into Choreography_Test
Doesn't check lag time for reset all!
Merge branch 'Choreography_Test'

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