Fixed a bug in logging in, fixed up the tacher view.
Fixed merge conflicts.
Merge pull request #15 from wilchandler/standards-seed-files

Standards seed files
Merge branch 'master' of https://github.com/wilchandler/exitslips into student-views
more work on taking a quiz