mentors can add skills to their profile and they will show up on both the show and index pages
fix merge conflicts
Merge pull request #38 from coreyd303/mentor-skills

mentors can add skills to their profile and they will show up on both th...