Merge branch 'feature-B'

Conflicts:
	TahDoodle/BNRDocument.h
Merge branch 'master' of https://github.com/tat-okamoto/git-tutorial2