Add collision detection
Merge branch 'master' of https://github.com/ruizhenh/FAT