added player vs. player collision
Merge branch 'master' of https://github.com/ChrAfonso/jamgame