Refactoring Combustibles.java and Combustible.java
Merge pull request #16 from llorllale/master

Refactoring Combustibles.java and Combustible.java