Arreglado el repositorio como estaba antes
Arreglado el repo
Merge branch 'master' of git@github.com:ULE-Bank/payments.git

Conflicts:
	.classpath
	db/load_data.sql
	src/main/java/es/unileon/ulebank/repository/CardDao.java
	src/main/java/es/unileon/ulebank/repository/InMemoryCardDao.java
	src/main/java/es/unileon/ulebank/repository/JPACardDao.java
	src/main/java/es/unileon/ulebank/service/CardManager.java
	src/main/java/es/unileon/ulebank/service/SimpleCardManager.java
	src/main/webapp/WEB-INF/spring/app-config.xml
	src/main/webapp/WEB-INF/views/cards.jsp
	target/m2e-wtp/web-resources/META-INF/maven/es.unileon/ulebank/pom.properties
Arreglo de conflictos