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

Conflicts:
	pom.xml
Merge branch 'master' of
https://github.com/TheSpanishTeam/FirstProject.git