progress before discussion section
Merge branch 'master' of https://github.com/LeoSimkin/Porj3.git

Conflicts:
	exception.c
	kos.c