Merge the master branch
Merge branch 'master' of https://github.com/ogarci5/centauri into oliverg
Added local file upload