commit user 1
commit user 2
Merge branch 'master_test_git_user2' into master_test_git
Conflict comit user 1
Conflict comit user 2
Merge branch 'master_test_git_user2' into master_test_git

Conflicts:
	absence_management.core/src/main/java/com/crispico/absence_management/model/Employee.java
Conflict de stergere
Conflict de stergere user 2
Merge branch 'master_test_git_user2' into master_test_git

Conflicts:
	absence_management.core/src/main/java/com/crispico/absence_management/model/Employee.java