Refactored
Merge branch 'master' of https://github.com/milo-trujillo/WordOfMouth