update CONTRIBUTING.md to include step to pull and fix conflicts prior to creating PR
Merge branch 'develop' of github.com:ucsdlib/damspas into develop