Lab resolving git conflicts#67

DGus4 wants to merge 6 commits intoironhack-labs:masterironhack-labs/data-labs:masterfrom

DGus4:lab-resolving-git-conflictsDGus4/data-labs:lab-resolving-git-conflictsCopy head branch name to clipboard