changes
Merge branch 'master' of https://github.com/nicot/OS

Conflicts:
	two/multi-lookup.c
	two/queue.o
	two/util.o