Added collisions logic
Merge branch 'master' of https://github.com/CloverClub/BlackDragon