Added @ServletSecurity annotations to restricted servlets;
Fixed file path references in web.xml for Login and LoginError JSPs
Merge branch 'master' of https://github.com/rolland0/Team6_CSC280_Lab
Merge branch 'master' of https://github.com/rolland0/Team6_CSC280_Lab
Merge branch 'master' of https://github.com/rolland0/Team6_CSC280_Lab