fix indentation
fix merge conflict
Merge pull request #5 from mfa213/feature-pocket_integration

Feature pocket integration