last part
Merge branch 'master' of https://github.com/awood314/cs170

Conflicts:
	start/kos.c
Merge branch 'master' of https://github.com/awood314/cs170
a