a
Merge branch 'master' of https://github.com/RRozza/Simulador

Conflicts:
	EOSimulator/eosim1.1.1/lib/eosim1.1_d.lib
a