trying to link with Johanna's buttons
teacher
Merge branch 'Molly-feature'
merge conflict
Merge branch 'master' of https://github.com/rgschneider/group-project-base into johanna_feature
buttons
Merge pull request #16 from rgschneider/johanna_feature

teacher.html
getting closer