a
Merge branch 'jsp' of https://github.com/ZeroToHero-2014/JEE into jsp

Conflicts:
	src/main/java/ro/teamnet/z2h/web/ZeroToHeroServlet.java
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.jsp