Adding lab1_git
Remove Mergeconflict