aa
Merge branch 'master' of https://github.com/deib-polimi/DDAapi

Conflicts:
	.gitignore
Big refactoring and restructuring of the DDA api