Merge pull request #38 from rickcarlino/master

May 8th
Merge pull request #39 from rickcarlino/master

May 11th
Merge branch 'master' of github.com:FarmBot/farmbot-web-backend
Saving progress for a redeployment
Code touch ups