added upload cols in db
file upload progress
s3 progress
need to duoble check bugs, and style but image upload done. still needs to tell or show user not to put in a url if they upload though
merge conflict done