comment added
Conflict resolution!
Merge branch 'ot-branch1'

Conflicts:
	misc.cpp