2014-11-14 15:42:29  add2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cn/Stone/test/Main.java
2014-11-14 15:58:48
2014-11-14 15:59:29
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cn/Stone/test/Main.java
Merge remote-tracking branch 'origin/master - fan' into Fan

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