Matt is dumb, and is apparantly unable to type correctly
Merge pull request #22 from vcnickerson/controller/mattj/dev

Matt is dumb, and is apparantly unable to type correctly