My own comment footnote.
Note for later.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DCOSS/bare_conf.tex
	DCOSS/introduction.tex