Added lines
Merge branch 'master' of github.com:kln/testapp

Conflicts:
	file.txt