Two column layout of pdf file.
Added numeric integration to pdf.
Merge branch 'twocols'

Conflicts:
	comprog.pdf