Added myself to dev team
Fixed merge conflict with Matt
Merge pull request #170 from elliottbiondo/dev-team

Dev team