Added ability to upload files for users
Merge branch 'master' into file_upload
Merge pull request #25 from nairys/file_upload

file_upload