restructured the conformance section
merge
Merge branch 'guancio'

Conflicts:
	paper/paper2.aux
	paper/paper2.log
	paper/paper2.pdf
	paper/paper2.tex