ö
Merge branch 'master' of https://github.com/PaulPauls/91632254f013454eb85130ee5dd2c94a

Conflicts:
	NewSysPrakProject/thinker.c
jo
Merge branch 'master' of https://github.com/PaulPauls/91632254f013454eb85130ee5dd2c94a

Conflicts:
	NewSysPrakProject/thinker.c