where i am now
Merge branch 'master' of https://github.com/cioboteacristian/SDM_project

Conflicts:
	Project/.classpath
	Project/src/configuration/DBConfig.java
	Project/src/configuration/Setup.java