merge
Merge branch 'master' of https://github.com/BRO-FHV/Kernel

Conflicts:
	main.c