change makefile
ch mak
Merge branch 'master' of github.com:nushio3/practice

Conflicts:
	halide/Makefile