derp
Merge branch 'master' of github.com:ccLinux/Carch

Conflicts:
	kernel/kernel.lua