fixing registration, not done yet
Merge branch 'master' of github.com:rgschneider/group-project-base into Molly-feature
actions button formatted
Merge pull request #13 from rgschneider/johanna_feature

Johanna feature
working on modal, getting closer
bootstrap3 deleted
Merge pull request #14 from rgschneider/Molly-feature

Molly feature
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