修补了 包含重复定义 不能运行的错误
Merge branch 'master' of https://github.com/dannion/GuessWord

Conflicts:
	GuessWord/NewModel/NewBoardCell.m
	GuessWord/NewModel/NewWord.h