added diamond state
Merge branch 'master' of github.com:accumulo/graphite-formula