Added rain and collision
Merge branch 'Add-collision-rain'