modal js working
Merge branch 'master' of github.com:rgschneider/group-project-base into Molly-feature
Merge branch 'master' of github.com:rgschneider/group-project-base into Molly-feature
added sorl-thumbnail to requirements.txt
teacher views
Merge branch 'master' of https://github.com/rgschneider/group-project-base into johanna_feature
working on teacher css
Merge pull request #41 from rgschneider/johanna_feature

Johanna feature
slides
js working
Merge pull request #42 from rgschneider/Molly-feature

Molly feature
Merge branch 'master' of https://github.com/rgschneider/group-project-base into robert-feature
Merge pull request #43 from rgschneider/robert-feature

Robert feature
Merge pull request #44 from rgschneider/jon-feature

Jon feature
teacher page minus caret
Merge pull request #45 from rgschneider/Molly-feature

teacher page minus caret
admin login m-fgit add .git add .