= Merging

src/dataStructures/KittyChannel.java

@@ -1,31 +1,15 @@
 package dataStructures;
 
-//import core.DatabaseTrackedObject;
 
-public class KittyChannel //extends DatabaseTrackedObject
+public class KittyChannel 
 {
 	public String uniqueID;
-	public KittyGuild guild;
+	public boolean mature;
 	
-	//public KittyRating rating;
-	//public bool isVoice;
-	
-	public KittyChannel(String uniqueID, KittyGuild guild)
+	public KittyChannel(String uniqueID, boolean mature)
 	{
 		//super(uniqueID);
 		this.uniqueID = uniqueID;
-		this.guild = guild;
-	}
-
-//	@Override
-//	public String serialize() 
-//	{
-//		return "";
-//	}
-//
-//	@Override
-//	public void deSerialzie(String string) 
-//	{
-//		
-//	}
-}
+		this.mature = false;
+	}	
+}