makefile fixed
Merge branch 'master' of https://github.com/xhongyi/toybrick

Conflicts:
	avx/Makefile