synched with origin
synched with origin
Got uploads working locally. Not working on heroku yet