probando git2
Merge origin/master