マージ
Merge branch 'master' of https://github.com/itsuki5k/HMF
Merge branch 'master' of https://github.com/itsuki5k/HMF

Conflicts:
	FUTURE FISH FARM(2010ver)/Number.cpp
バグその他修正