Merge remote-tracking branch 'upstream/master'
Testing trigger words
Merge pull request #7 from noodlefrenzy/master

Testing trigger words