fixed merge conflict
fixes
Merge pull request #17 from econchick/plugins

Plugins