Added in collisions - Collision detection must be seriously fixed - and the collisions themselves should be changed - feel a bit too bouncy at the moment
Merge conflicts from temp files - No major changes necessary
Merge conflicts unnecessary because of temp files - continuing