teapot added
Python
Added video
Merge branch 'master' of https://github.com/MartinFaartoft/sigb

Conflicts:
	report2/report_ass2.tex