removed .idea
fixed conflicts
Edited the file upload page and added a helper module for file manipulation.