changement Ivania
Merge branch 'master' of github.com:indonoso/Project

Conflicts:
	src/Agents/Scenario.java
	src/DataBase/DataBase.java

"commit problems"
fixed errors in merge and errors in loading type operation