Added a collision clause

Changed 4 classes which use this new clause
Merge remote-tracking branch 'origin/master' into Trevor
put the new art assets in the project