valentina
Merge branch 'master' of https://github.com/maryloulou/DA-project.git

Conflicts:
	src/ValentinaClass.java