Master Changes

*Col passes through death.
*PlayerPrefixs
*skills be worked on
Pretty old merge conflicts I forgot about :L