Fix Suffocate Conflicts

Conflicts:
	src/com/projectkorra/ProjectKorra/airbending/Suffocate.java
1.4.0 BETA 5