starting on pt2
Merge branch 'master' of github.com:MartinFaartoft/sigb

Conflicts:
	ass2/Assignment2.py