Fixed so users can upload songs
Fixing user clips upload

Merge branch 'master' into tommy_readme_jasmine
Merge pull request #72 from red-admirals-2014/tommy_readme_jasmine

Tommy readme jasmine