Merge branch 'master' of C:\Users\juan\android_con_git\Sportfit with conflicts.
Merge remote-tracking branch 'origin/master'
historial terminado