commit
commit
Merge branch 'master' of
https://github.com/brunano21/ai-project-server.git into gnz-branch

Conflicts:
	pom.xml