Merge branch 'develop' into 'master'

.classpath

.gitlab-ci.yml

.refactorings/2017/12/52/refactorings.history

.refactorings/2017/12/52/refactorings.index

.refactorings/2018/1/2/refactorings.history

.refactorings/2018/1/2/refactorings.index

.settings/org.eclipse.ltk.core.refactoring.prefs

src/main/java/inf/uva/es/ivagonz/practica4/ColaDeAmigos.java

src/main/java/inf/uva/es/ivagonz/practica4/Persona.java

...ava/inf/uva/es/ivagonz/practica4/AllColaDeAmigosTest.java

...est/java/inf/uva/es/ivagonz/practica4/AllPersonaTest.java

src/test/java/inf/uva/es/ivagonz/practica4/AllTest.java

...va/inf/uva/es/ivagonz/practica4/ColaDeAmigosMockTest.java

...nf/uva/es/ivagonz/practica4/ColaDeAmigosSequenceTest.java

...ava/inf/uva/es/ivagonz/practica4/ColaDeAmigosTDDTest.java

...t/java/inf/uva/es/ivagonz/practica4/ColaDeAmigosTest.java

...va/inf/uva/es/ivagonz/practica4/ColaDeAmigosUnitTest.java

src/test/java/inf/uva/es/ivagonz/practica4/EjemploTest.java

src/test/java/inf/uva/es/ivagonz/practica4/Integration.java

src/test/java/inf/uva/es/ivagonz/practica4/Isolation.java