changed how skills are handled
brought down some updates

Merge branch 'master' of https://github.com/m241dan/swrproject