Simple change to test push
Merge remote-tracking branch 'upstream/master'
Added delay and sensitivity parameters to master config
Merge pull request #1 from bru917/master

First try at pull request