four commit
添加jvm内存分配的测试类和测试框架mockito的测试类
加入提示信息
Merge branch 'master' of https://github.com/stephenZkang/test.git

Conflicts:
	test/src/test/Test.java