this is v3
added index.html
Index added
my changes
js added
HolaServlet.java added
Merge branch 'master' of
https://github.com/woorea-training/experiences.git

Conflicts:
	WebContent/index.html
Merge branch 'master' of
https://github.com/woorea-training/experiences.git

Conflicts:
	WebContent/index.html
	src/es/experiences/web/HolaServlet.java
v4
Merge branch 'upstream'
mis modificaciones
Merge branch 'upstream'

Conflicts:
	WebContent/index.html
	src/es/experiences/web/HolaServlet.java
Merge branch 'master' of https://github.com/jesus-gomez/experiences.git