added collision prop
233
removed trash
Merge branch 'master' of https://github.com/WeAthFoLD/CritEngine