Move all the Song related stuff from SongsController to Song
Clean-up user.rb
Merge branch 'master' into dev - Clean-up user.rb
Add 'year' to Song