Added rudimentary FP-style collision detection for Entity
Merge branch 'master' of github.com:Gazok/Tank