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

added conflict.txt
Merge branch 'develop' into testing-bsan

Conflicts:
	conflict.txt