Lab resolving git conflicts#48

reche025 wants to merge 3 commits intoironhack-labs:masterironhack-labs/data-labs:masterfrom

reche025:lab-resolving-git-conflictsreche025/data-labs:lab-resolving-git-conflictsCopy head branch name to clipboard