Relocated isAdmin check to LoginFilter.java
Merge branch 'master' of github.com:rolland0/Team6_CSC280_Lab

Conflicts:
	Project/Project/src/servlets/PromoteMePlease.java
Updated AdminPage for the LoginFilter's isAdmin attribute. Apologies if anything broke; everything worked in my tests
Merge branch 'master' of github.com:rolland0/Team6_CSC280_Lab