added conflict.txt
Merge pull request #3 from bsan/troloTOPIC

added conflict.txt
Merge remote-tracking branch 'origin/develop' into Test1

Conflicts:
	conflict.txt