working test
fixed merge conflicts
Merge pull request #41 from PlantAlert/before-blocks

Before blocks