Delete SongsHelper and its specs. Not needed anymore
fix merge conflict
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
change methods from where..first_or_create to first_or_create_by
Merge pull request #51 from tihuan/master

Refactor Controllers