Updated license info
Merge branch 'master' of github.com:christopherL91/Upload