Removed experience system, added changing equipment from skills
fixed merge issues