Function for uploading resources now works
Merge remote-tracking branch 'origin'