updated db and added file uploader (needs a small fix)
weird merge sad ; ;