attempted to get user login check that there is an @morris.umn.edu address used, and attempted to get apostrophe working (ended up not really using this, so we commented it out).
Merge remote-tracking branch 'origin/master'