still chasing merge errors
Merge pull request #13 from crdschurch/feature/US701-AddSkillToMyProfile

still chasing merge errors