topic
changing topic2
Merge branch 'topic' into devel

Conflicts:
	README