go
Merge branch 'master' of https://github.com/cxnvcarol/isis

Conflicts:
	.cproject
	src/simuladorV1.cpp
listo