File Uploader, Week 10

Not much has happened this week since arriving back home and moving into my apartment at college, though I did have a chat with my mentor to clarify the remaining todo items for the uploader project. I have started the basics of merging my changes with 3.2 and will hopefully have a testable version for download soon.