Readme
Merge branch 'master' of github.com:stura-hftl/karaoke