Final changes, disabled toggle
Merge branch 'master' of https://github.com/danluna/MusicInMotion