no change recorder
up to date
Merge branch 'master' of https://github.com/brittlewis12/batman
Merge branch 'master' of https://github.com/brittlewis12/batman
Merge branch 'master' of https://github.com/brittlewis12/batman
removed latest migration
fix conflict in schema and merge
dropped tables and ran migrations again
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
make seeds
Merge branch 'master' into controllers
passToUploader function set up without user info
temp removed tracks from songs resources
merged teas passToUploader function