Changes to active tab 2 workflow
fixed studentPortal.js and studentPortal.css merge conflicts