Primer push a repositorio
Problems merging files
Merge branch 'master' of https://github.com/deirdrak/MiniDropbox