before player pull
Merge branch 'master' of https://github.com/rising-thunder/rasr
adds robertos changes