jplayer, test stuff
Merge branch 'master' of https://github.com/mdsib/music-putty

things