1
jk
Merge branch 'master' of https://github.com/dougian/os

Conflicts:
	run_tests.sh
Friday 11/8 : Stats and timestamps etc