最终版
Merge branch 'master' of https://github.com/fz1989/OOPHomework
fix merge bug
Conflicts:
	OOPHomework.cbp
	OOPHomework.depend
	OOPHomework.layout
	include/RandomNumber.h
	main.cpp