added all changes
Merge branch 'master' of github.com:razzius/karaoke