Added line 1.5
Merge branch 'master' of https://github.com/mmaunu/SourceTreeTesting

Conflicts:
	two.txt