commit Charge.java
Solved conflict in Charge.java

Conflicts:
	fdisk/src/main/java/domain/Charge.java