A
Merge remote-tracking branch 'origin/master'

Conflicts:
	BaselineMain/chapters/04Design_Options/041DOT.tex