Uploaded Kadyn's Designs
resolved conflicts, added kadyn's designs