Merge pull request #13 from viperchris3/work

Changed timers for intents