delete d
Merge branch 'master' of https://github.com/caste-matteo/P.git

Conflicts:
	Primo/src/Main.java