refactoring, split in shell + player
Merge branch 'gh-pages' of github.com:padenot/popathon-2 into gh-pages