4th commit

for checking conflict
4th commit 2

for checking conflict
Merge branch 'feature-B'

Conflicts:
	TahDoodle/BNRDocument.h