Fixed Collision Detection

Collision detection and resolution now (mostly) works.

Started implementing window borders.