commit before merge
Merge remote-tracking branch 'remotes/upstream/gh-pages' into gh-pages
commit before merge
add docs hen-entry
Merge remote-tracking branch 'remotes/upstream/gh-pages' into gh-pages
add docs for henhouse,consumable,employee and additional data
add docs for usage,employee cost and egg production
Merge pull request #24 from finestrike/gh-pages

Docs for master data and consumable usage, employee cost and egg production