Merge pull request #6 from Bart-Beyers/master

Self method + cors shizzle + confict fixes (hopefully fixes:) )
trylogin
Merge branch 'master' of github.com:dietergoetelen/skillstracker
Merge remote-tracking branch 'upstream/master'
UserSkills POST,PUT,DELETE