Signed-off-by: IcePlus <zhengjiabin.tj@gmail.com>
Signed-off-by: IcePlus <zhengjiabin.tj@gmail.com>
Merge branch 'master' of https://github.com/IcePlus/CodeTour

Conflicts:
	bin/com/codetour/model/AstFactory.class
	src/com/codetour/model/MainTest.java
	src/com/codetour/utils/ConstValueUtil.java