Lab resolving git conflicts#44

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

vanessaboaventura:lab-resolving-git-conflictsvanessaboaventura/data-labs:lab-resolving-git-conflictsCopy head branch name to clipboard