repo 2
Merge branch 'master' of ssh://git@github.com/liangzhu198/lab1_git.git

Conflicts:
	MergeConflict.txt