collision fix
Merge branch 'master' of github.com:SurrenderMonkeys/sm-gamecraft-2013