SEARCH LAST VERSION NOT WORKING
conflict
Merge branch 'master' of https://github.com/cioboteacristian/SDM_project

Conflicts:
	Project/companyID_Name.txt
	Project/keys/private/private.key1
	Project/keys/private/private.key2
	Project/keys/private/private.key3
	Project/keys/public/public.key1
	Project/keys/public/public.key2
	Project/keys/public/public.key3
	Project/src/configuration/DBConfig.java