added trilock test case
removed print
Merge branch 'master' of https://github.com/fchoo/lab4

Conflicts:
	Makefile
	kernel/device.c