Moved user-profile template to templates folder
Moved user-skills code into user-profile
Moved user-skills code into user-profile (but actually)
Here's some progress
More progress yayyyy
Progress so far
Merge latest master with branch
Got Slogan editable field done for User Profile
Merge UF-195 with UF-115 to prevent future conflicts
Integrated user-skills into user-profile Angular controller
Progress on showing related teams and projects
Removed extraneous code
Merge branch 'master' into UF-115
merging UF-115 inline editing on user-profile