test: testing the workflow from upstream to subtree, via enhancement/master
Merge branch 'master' of https://github.com/luminize/upstream into upstream-branch
log: add more info about remote branches and tracking
test: see how linking works
fix link
fix link
fix link
log: about testing the workflow
Merge branch 'subtree-branch' of https://github.com/luminize/enhancement into subtree-branch

Conflicts:
	docs/logging my workflow.asciidoc