Cambios
Merge branch 'master' of https://github.com/Arquisoft/Entrecine4
Merge branch 'master' of https://github.com/Arquisoft/Entrecine4.git

Conflicts:
	bin/src/main/java/es/uniovi/asw/entrecine/Reservation.class
	bin/src/test/java/SimpleTest.class
	bin/src/test/java/es/uniovi/asw/entrecine/ReservationTest.class