Algo se modifico
Cambio al pom, agregado el servlet, cambio del jdk a 1.7
Merge remote-tracking branch 'origin/master'

Conflicts:

	target/m2e-wtp/web-resources/META-INF/maven/WebArtiomJoaquin/WebArtiomJoaquin/pom.properties

	target/m2e-wtp/web-resources/META-INF/maven/WebArtiomJoaquin/WebArtiomJoaquin/pom.xml
Merge branch 'master' of
https://github.com/joaquinPega/ProjectJoaquinArtiom

Conflicts:

	target/m2e-wtp/web-resources/META-INF/maven/WebArtiomJoaquin/WebArtiomJoaquin/pom.properties

	target/m2e-wtp/web-resources/META-INF/maven/WebArtiomJoaquin/WebArtiomJoaquin/pom.xml