added UserSkill class
Merge branch 'origin/master'