Added bunny punching and new collision detection
Merging shiiiiiit