Lab resolving git conflicts - Martijn#1

martijnooo wants to merge 5 commits intoironhack-labs:mainironhack-labs/lab-resolving-git-conflicts:mainfrom

martijnooo:lab-resolving-git-conflictsmartijnooo/lab-resolving-git-conflicts:lab-resolving-git-conflictsCopy head branch name to clipboard