corregí formulas
Merge branch 'master' of https://github.com/omarloren/o-me

Conflicts:
	EURUSD.csv
	config/eurusd.json
	src/app/App.java
	src/app/Thready.java
	src/app/trade/Gear.java
	src/util/Excel.java
nuevo sistema de estado