Merge pull request #16 from ChinosInternationalCC/master

update
detect type of object on collision
Merge pull request #77 from kubamarkiewicz/master

detect type of object on collision