cloulu java exam (servlet exam)
Merge branch 'master' of https://github.com/cloulu/cloulu-java-exam.git

Conflicts:
	pom.xml
	src/main/java/com/cloulu/samples/HelloClouluServlet.java
	src/main/webapp/WEB-INF/web.xml