updated makefile
Merge branch 'master' of https://github.com/hyoshid1/project375