upload file
Merge branch 'master' of https://github.com/pratipo/marcador
gui (android studio project) added