1 dec
Merge branch 'master' of https://github.com/DriesN/MasterproefDries

Conflicts:
	lib/costfunction.m