commit2
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt
commit3
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt
commit4
Merge remote-tracking branch 'origin/master'

Conflicts:
	people.txt