2014-11-14 15:45:43 This is Hope
Merge remote-tracking branch 'origin/Hope'

Conflicts:
	src/cn/Stone/test/Main.java