Merge pull request #1 from st2135/master

initial file upload support
TOTALLY NOT WORKING COMMIT (no other way to sync while not home)
Merge remote-tracking branch 'upstream/master'