GUI Reforming Update
Scrolling Time Label + Color
TimeLine label v 2.0
Updated Version of Choreography Software
Fixed some Music Pane bugs.

Fixed Play/Pause Button. Reset moves to beginning of song. Rewrote the
updateProgress algorithm to use a polling method. Cuts resource usage
way down…. Warning! Will need JDK 8. Talk to Max.
Merge branch 'GUI-DEV-FRANK' into GUI-DEV-MERGE
Merge branch 'GUI-DEV-MERGE'

Conflicts:
	.gitignore
	Choreography_Dev/src/choreography/view/timeline/Timeline.fxml
	Choreography_Dev/src/choreography/view/timeline/TimelineController.java