merging time
Merge branch 'master' of https://github.com/choucalate/music
fixed a lot of thecrud difficulties in transitioning to the hash datastructure