Funhouse Collisions

Finished adding collisions to the fun house.