3rd commit
Merge branch 'master' of github.com:ffreitas/karaoke