refractored method
updated collision
colliison logic
Revert "colliison logic"

This reverts commit cdfbc04b37132caaf697a05c32e12f0ad41c4d9f.
Revert "Revert "colliison logic""

This reverts commit 022480a228a86b98524e503234e767fa2f9a3b60.
Revert "Revert "Revert "colliison logic"""

This reverts commit 1f15126eb26a13f29d73af20bbc7d740954a4826.
collision logic clean
Merge pull request #15 from Institute-Web-Science-and-Technologies/Nils

Nils