updates .gitignore file
handles file upload issue
Merge branch 'develop'