added myself to the dev team
Fixed merge conflict with Matt