deleted signinginservlet for causing merge conflict