Merge pull request #1 from kibio/master

merge
Merge pull request #2 from kibio/master

merge update
remove index.haml, update README.md
Merge branch 'master' of https://github.com/yyolk/kibio-player
fix typo - README.md
Merge pull request #1 from yyolk/master

Remove index.haml update README.md