Merge branch 'master' of https://github.com/nukeguys/WordPop into homonym

Conflicts:
	.gitignore
merge .gitignore
Merge branch 'homonym' of https://github.com/nukeguys/WordPop into homonym