gem
Merge branch 'master' of https://github.com/sunnyera/singingalong
timing more readable
ulogin
conflict
Merge branch 'master' of https://github.com/sunnyera/singingalong
admin user login logout
gem