gitignore update
Merge branch 'master' of github.com:76house/herbalist-server