mi primer upload a git
Merge origin/master