add songs played
Add second default user
update sass-rails
Merge branch 'gemupdates'
update gemfile
Merge branch 'gemupdates'
refresh rake file
update gemfile
Merge branch 'gemupdates'
Merge branch 'master' into songs