modified gs code to get everything back up and running
Merge branch 'master' of https://github.com/lindseydi/Team23