update index.html to wrking file
merge
conflicts
Merge branch 'master' of https://github.com/kibio/kibio-player
update index.html
Merge branch 'master' of github.com:yyolk/kibio-player
update common
fix js builder
add websocket.js and route player controls
Merge branch 'master' of https://github.com/kibio/kibio-player
now can populate playlist from player
Merge pull request #2 from yyolk/master

add routing and websocket libs to index.html