Merge pull request #112 from sli-fox/mark_branch

Added Jeremy's effects within the respective Effect decorator
Merge branch 'master' of https://github.com/sli-fox/jamms into mark_branch