small changes
fixed merge
working
Merge pull request #10 from juliataitz/whenever

Working whenever