add files
Merge branch 'master' of github.com:szqh97/test
update files

Conflicts:
	cpp/FixedAllocator.cpp
	cpp/FixedAllocator.h
update FixedAllocator*