Testing upping folder
Merge branch 'master' of github.com:hetget/sdlstuff