AA
Merge branch 'master' of
https://github.com/TheSpanishTeam/FirstProject.git

Conflicts:
	src/main/java/com/FirstProject/pages/SubmitNewVacationA.java
	src/test/java/com/FirstProject/S4_1_CancelVacationHistoryVacationTest.java
	src/test/java/com/FirstProject/S4_2_ViewAllVacationsTest.java
	src/test/java/com/FirstProject/S4_3_ViewConcediuDeOdihnaTest.java
	src/test/java/com/FirstProject/S4_4_ViewConcediuFaraPlataTest.java
	src/test/java/com/FirstProject/S4_5_ViewConcediuMedicalTest.java
	src/test/java/com/FirstProject/S4_6_ViewConcediuSpecialTest.java
	src/test/java/com/FirstProject/S4_7_MultipleTypesOfVacationsTest.java
	src/test/java/com/FirstProject/S4_8_ViewConcediuByTypeAndDate.java
	src/test/java/com/FirstProject/S4_9_ViewConcediuByDateTest.java
	src/test/java/com/FirstProject/steps/SubmitNewVacationStepsA.java