Project rebuild
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	PracticaJUnit/PracticaJUnit-web/pom.xml

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT.war

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT/WEB-INF/classes/org/jortiz/ut/pjt/c3/FarenheitCelciusConverter.class

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT/WEB-INF/classes/org/jortiz/ut/pjt/c3/StatisticsUtils.class

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT/WEB-INF/classes/org/jortiz/ut/pjt/c4/FootBallTeam.class

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT/WEB-INF/classes/org/jortiz/ut/pjt/c4/PasswordValidator.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/FarenheitCelciusConverter.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/InformacionContacto.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/Money.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/Persona.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/StatisticsUtils.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/StringUtils.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c4/FootBallTeam.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c4/PasswordValidator.class
	PracticaJUnit/PracticaJUnit-web/target/maven-archiver/pom.properties

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.FarenheitCelciusConverterTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.HashMapTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.MoneyIAETest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.MoneyParameterizedTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.MoneyTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.PersonaTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.StatisticsUtilsParameterizedTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.StringUtilsTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c4.FootBallTeamTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c4.PasswordValidatorTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c4.RegexUtilsTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.FarenheitCelciusConverterTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.HashMapTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.MoneyIAETest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.MoneyTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.StatisticsUtilsParameterizedTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c4.FootBallTeamTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c4.PasswordValidatorTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c4.RegexUtilsTest.txt

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/FarenheitCelciusConverterTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/HashMapTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/MoneyIAETest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/MoneyParameterizedTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/MoneyTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/PersonaTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/StatisticsUtilsParameterizedTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/StringUtilsTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c4/BookingSystemSchedulerTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c4/FootBallTeamTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c4/PasswordValidatorTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c4/RegexUtilsTest.class
Merge branch 'master' of https://github.com/Ob1Ju4n/PracticalJUnit

Conflicts:
	.gitignore
	PracticaJUnit/PracticaJUnit-web/pom.xml

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT.war

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT/WEB-INF/classes/org/jortiz/ut/pjt/c3/FarenheitCelciusConverter.class

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT/WEB-INF/classes/org/jortiz/ut/pjt/c3/StatisticsUtils.class

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT/WEB-INF/classes/org/jortiz/ut/pjt/c4/FootBallTeam.class

	PracticaJUnit/PracticaJUnit-web/target/PracticaJUnit-web-1.0-SNAPSHOT/WEB-INF/classes/org/jortiz/ut/pjt/c4/PasswordValidator.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/FarenheitCelciusConverter.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/InformacionContacto.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/Money.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/Persona.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/StatisticsUtils.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c3/StringUtils.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c4/Bookable.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c4/FootBallTeam.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c4/PasswordValidator.class

	PracticaJUnit/PracticaJUnit-web/target/classes/org/jortiz/ut/pjt/c4/RegexUtils.class
	PracticaJUnit/PracticaJUnit-web/target/maven-archiver/pom.properties

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.FarenheitCelciusConverterTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.HashMapTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.MoneyIAETest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.MoneyParameterizedTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.MoneyTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.PersonaTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.StatisticsUtilsParameterizedTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c3.StringUtilsTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c4.FootBallTeamTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c4.PasswordValidatorTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/TEST-org.jortiz.ut.pjt.c4.RegexUtilsTest.xml

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.FarenheitCelciusConverterTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.HashMapTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.MoneyIAETest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.MoneyTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c3.StatisticsUtilsParameterizedTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c4.FootBallTeamTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c4.PasswordValidatorTest.txt

	PracticaJUnit/PracticaJUnit-web/target/surefire-reports/org.jortiz.ut.pjt.c4.RegexUtilsTest.txt

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/FarenheitCelciusConverterTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/HashMapTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/MoneyIAETest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/MoneyParameterizedTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/MoneyTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/PersonaTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/StatisticsUtilsParameterizedTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c3/StringUtilsTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c4/BookingSystemSchedulerTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c4/FootBallTeamTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c4/PasswordValidatorTest.class

	PracticaJUnit/PracticaJUnit-web/target/test-classes/org/jortiz/ut/pjt/c4/RegexUtilsTest.class