Initial commit.
Merge branch 'master' of https://github.com/manilion/haoziwei

Conflicts:
	haoziwei/src/com/haoziwei/RecommendRecipeGenerator.java