finish makefile
Merge branch 'lab03lee' into lab03
last one prob