admin functions
OMerge branch 'master' of git@github.com:RobertMcDermot/CS1530Project.git

Conflicts:
	ClassWeb/war/addendum/addendum.nocache.js