Merge pull request #81 from acjones617/master

Angularize player, begin to merge Romain collision changes
before player pull
Merge branch 'master' of https://github.com/rising-thunder/rasr
adds robertos changes
Merge conflicts