8ball service
Merge pull request #3 from ChrisBarthol/eightball

8ball service
Fixing Chris's stuff
Fix merge conflict