merge
Merge branch 'master' of github.com:Vandborg/SW505E14

Conflicts:
	color_scanning/color_scanning.c