working version - thanks to ben attal for helping me with decorator syntax
Merge branch 'master' of https://github.com/stuycs-softdev/submissions
Merging in my code