Removed merge conflict tags from Detector
Merge pull request #15 from ewdicus/master

Removed some merge conflict tags from Detector.js