test no checkout
Merge branch 'master' of http://github.com/cnberry/kernel_1

Conflicts:
	README

hello world merge test
Merge branch 'master' of http://github.com/cnberry/kernel_1
Added section in initproc_run for chris