collision rulles fixed
Merge branch 'master' of github.com:michalbe/loremipsum