merge Molly
Merge branch 'master' of https://github.com/rgschneider/group-project-base into johanna_feature
working?
Merge pull request #33 from rgschneider/johanna_feature

Johanna feature