Collision system updated, now actually does something.

Committed this module because Josh didn't want to do it himself for
some reason, not totally sure on all of the changes that were made,
but the collision system now definately does something.
Forgot to add files to previous commit. Now properly added.

The last commit by me had only 1 file changed, now it has been properly
updated to show the accurate changes.
Added basic collisions and semi-smoothed movement.

The movement is not complete yet, will have a better version coming
soon.
Merge branch 'Gameplay-Collision' into Gameplay