team fixes
Merge branch 'master' of https://github.com/sunnyera/singingalong
fixes