Servlets studing
Fixed merge step 2