Added quad collisions
Merge pull request #24 from Smilex/quad_coll

Added quad collisions