Added another line
Merge branch 'master' of github.com:njmittet/git-test

Conflicts:
	client.txt