Added collision detection and Weapon framework

Also changed how characters are implemented