controller logic sound
fixing merge conflicts
merge conflicts fixed
Merge pull request #83 from JYoung217/word-spec

Word spec