let's continue to change

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

Conflicts:
	Project/src/main/Main.java
	Project/src/tools/DatabaseProcess.java