better makefile
Merge branch 'aster' of github.com:h8liu/nachos

Conflicts:
	code/Makefile