Merge pull request #10 from zapiski/master

New notes + file upload