提交
Merge branch 'master' of https://github.com/chshssky/GREWords

Conflicts:
	GreWords/GreWords/GreWordsViewController.m