Add SourceAbility, change getElementColor()

getElementColor() is now defined in CoreAbility in a way that handles all
cases, rather than each ElementAbility having to handle it seperately

src/com/projectkorra/projectkorra/ability/api/AirAbility.java

@@ -20,14 +20,6 @@ public abstract class AirAbility extends CoreAbility {
 		return "Air";
 	}
 
-<<<<<<< HEAD
-=======
-	@Override
-	public final ChatColor getElementColor() {
-		return getAirColor();
-	}
-
->>>>>>> Add new CoreAbility API, Add BendingPlayer methods
 	/**
 	 * Gets the AirColor from the config.
 	 * 

src/com/projectkorra/projectkorra/ability/api/CombustionAbility.java

@@ -15,4 +15,5 @@ public abstract class CombustionAbility extends FireAbility implements SubAbilit
 	public Class<? extends Ability> getParentAbility() {
 		return FireAbility.class;
 	}
+	
 }

src/com/projectkorra/projectkorra/ability/api/CoreAbility.java

@@ -1,5 +1,6 @@
 package com.projectkorra.projectkorra.ability.api;
 
+import com.projectkorra.projectkorra.SubElement;
 import com.projectkorra.projectkorra.configuration.ConfigManager;
 
 import org.bukkit.ChatColor;

src/com/projectkorra/projectkorra/ability/api/LavaAbility.java

@@ -16,4 +16,5 @@ public abstract class LavaAbility extends EarthAbility implements SubAbility {
 	public Class<? extends Ability> getParentAbility() {
 		return EarthAbility.class;
 	}
+	
 }

src/com/projectkorra/projectkorra/ability/api/SandAbility.java

@@ -16,4 +16,5 @@ public abstract class SandAbility extends EarthAbility implements SubAbility {
 	public Class<? extends Ability> getParentAbility() {
 		return EarthAbility.class;
 	}
+	
 }