synchornizes player with websockets
Merge branch 'master' of https://github.com/jonjchew/mylittledisco into audio_player
Merge pull request #6 from jonjchew/audio_player

Audio player
Merge branch 'master' of https://github.com/jonjchew/mylittledisco into song-prettifier

Conflicts:
	app/assets/javascripts/main.js