Try 3
resolve merge conflict what we do/how we work changes
Merge pull request #1 from drewhaines/Matt

Matt