Clean up Conflicts

Conflicts:
	src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java
	src/com/projectkorra/ProjectKorra/firebending/Lightning.java