n
merging Merge branch 'master' of https://github.com/sunnyera/singingalong
categories populating properly
tag system done