updated loginpageservlet apparently
updated gitignore file
updated gitignore
Updating my branch with raul's changes manually
trying to fix the world by fixing these merge conflicts so we have a new_master with DBAO