Added two pseudo roles, coadviserOne and coadviserTwo, the only place left to add them in is the subform.controller.js
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor