deleted:    XYError.1cpp
	deleted:    XYError1.h
	.XYError1.h.swp
Merge branch 'master' of https://github.com/wanwenqq/53358861