new makefile
Merge branch 'master' of github.com:disyulei/wiremerge