Ioana-----Assigned
Merge branch 'master' of
https://github.com/TheSpanishTeam/FirstProject.git

Conflicts:
	src/test/java/com/FirstProject/AcceptedRequest.java
	src/test/java/com/FirstProject/AssignedTo.java
	src/test/java/com/FirstProject/Cancel_Assign_to.java
	src/test/java/com/FirstProject/RejectedRequest.java
	src/test/java/com/FirstProject/SubmitNewVacationA.java
	src/test/java/com/FirstProject/UserLogin.java
	src/test/java/com/FirstProject/requirements/ApplicationA.java
Merge branch 'master' of https://github.com/TheSpanishTeam/FirstProject.git