Added collision code
Merge branch 'master' of https://github.com/nornagon/clickfight