lab2 part 1.3 committing on master
lab2 1.3 committed on branch
lab2 1.3 commited master
lab2 1.3 merged branch into head
lab2 1.3 commited master
cherry-picking previous commit on master to revert MergeConflict.txt

Conflicts:
	lab2_files/lab2_git/MergeConflict.txt~