calculator classes refactored to a calculators package
Merge branch 'master' of github.com:csomakk/ShinyHeaven
refactor collision fix