Merge pull request #10 from zapiski/master

New notes + file upload
Merge pull request #56 from rokkolesa/master

Merge pull request #10 from zapiski/master