Reindenting and fix for upload
Fix ugly comments
File path is not based on the file type anymore
Merge pull request #19 from Cryde/fix-file-upload

Fix file upload