backend file uploading
merged stuff
merged some things
fixed some stuff in the server