Update to GS abilities
Merge branch 'master' of https://github.com/lindseydi/Team23