update
Merge branch 'master' of github.com:icanblink/dos

Conflicts:
	threads/list.h
	threads/parser.c
update