collision detection work
Merge branch 'master' of https://github.com/freshSTCH/HackRice14
Merge branch 'master' of https://github.com/freshSTCH/HackRice14