Update.

Signed-off-by: w00tc0d3 <w00tc0d3@outlook.com>
Merge branch 'master' of github.com:TeamBRM/FluxCharge

Signed-off-by: w00tc0d3 <w00tc0d3@outlook.com>

Conflicts:
	FluxCharge.iws
	src/main/java/net/teamflux/FluxCharge/utils/CommandArmorDebug.java