aome minimal changes
bugfix
Merge branch 'master' of https://github.com/HSLUStefanBachmann/BDAStefanCurdin

Conflicts:
	LivingWithLightColors/LivingWithLightColors.sdf
	LivingWithLightColors/LivingWithLightColors.v11.suo