Merge branch 'master' of C:\Users\OlgaVoronetskaya\Documents\GitHub\Wildflower with conflicts.
Merge remote-tracking branch 'origin/master'
update tests