Neglected question 6(redo shape example, since I didn't see it fit into report)
Merge branch 'master' of https://github.com/Shiphter/ITONK

Conflicts:
	report_dds/tex/technologies.tex