#11 | Cameron & Asif | Rewrote FileUploadController with proper TDD
Merge remote-tracking branch 'origin/master'