all tests green
Merge pull request #1 from NatalieFrecka/initial-dev

all tests green