Dick coding to fix bug
Merge branch 'master' of github.com:mdesanti/simulacion into gui