Ignoring newUserServlet.class in build folder
updated gitignore
updated doctorHome
updated gitignore
fixed merge conflicts in gitignore