Delete Folder done. Fix commit mistakes
Merge branch 'master' of https://github.com/Franktian/Upload-System

Conflicts:
	application/controllers/upload.php
	application/models/file.php
	application/views/delete_success.php
	application/views/displayfiles.php