Cleaned the code.
Cleaned.
Merge branch 'master' of https://github.com/lbcastro/epoc.git

Conflicts:
	Epoc/src/com/castro/epoc/Configuration.java
Rebuilt Calculation class.