an extra line marked 2
merge comments for 2 vs 3
Merge branch 'master' of https://github.com/colfraser/master

Conflicts:
	first_file.txt