Added thigns
Merge branch 'master' of https://github.com/carlosreig/papaheartzzi
New matrix of collisions