Updated for simple file uploading
Merge branch 'master' of https://github.com/mbogochow/TeamToo