updating this repo
Merge branch 'master' of https://github.com/jcavalu3/SDL

We need to do this
Merge branch 'master' of https://github.com/jcavalu3/SDL
stuff