in progress
in progress 2
Merge branch 'master' of https://github.com/cioboteacristian/SDM_project

Conflicts:
	Project/src/configuration/DBConfig.java