File upload
Merge pull request #13 from sbabitsky/master

File upload