before visualloader2
Merge branch 'chordtimeslider' of https://github.com/andrew-reece/cs171-final-project into chordtimeslider