change by TWO, added a new line
Merge branch 'master' of https://github.com/albertusalvin/learn-github

Conflicts:
	blah.txt