Restore to original

Conflicts:
	lab1_git/MergeConflict.txt