changes
Merge branch 'master' of https://github.com/daizhihui/tinyBase

Conflicts:
	src/Makefile
	src/Makefile~
	src/rm_test