modified:   src/domini/Agent.java
dd
Merge branch 'master' of https://github.com/prop-smiley/ver1 into carlos
Merge branch 'dev' of https://github.com/prop-smiley/ver1 into carlos
Merge branch 'carlos' of https://github.com/prop-smiley/ver1 into carlos