modify makefile
Merge branch 'master' of https://github.com/zh-cool/restful

Conflicts:
	src/Makefile