fixed erroneously changed activerecord relationships between users and songs
bringing over best parts of storagefun branch
fixed merge conflict from master in app assets application.js
brought over recorder notes
added storage.md
added aws javascript sdk to vendor assets
Merge branch 'master' of https://github.com/brittlewis12/batman
Merge branch 'storage2' of https://github.com/brittlewis12/batman into brittbackend
Merge branch 'master' into controllers
passToUploader function set up without user info
temp removed tracks from songs resources
merged teas passToUploader function
current stylesheets + reset
working connection to s3 after record.
Merge branch 'stylesheet' of github.com:teabait/batman into teastyle
made collaborators controller(collaborators has no model, or table. fancy that...)
removed janktastic application.css css
fixing merge conflicts, removed user_can_access_track private method and before_action on tracks controller
layout is in place and temp songs index
temp welcome index