Compiles
2
Merge branch 'master' of github.com:rossmcd/kernel

Conflicts:
	init/main.c