Edited conf also
Merge branch 'master' of https://github.com/SteveBash/test-git

Conflicts:
	conf.txt

Okay merged