upload file now possible, still need to handle work on loading in the file
Merge branch 'master' of github.com:gathcon/Group3ProjectWeb