jtmac6/gdd2game — pull request #3 by ry60003333 (2014-03-04 15:00:42+00:00)
Title: Collision resolution!

Merged in collision resolution.