wint-99 feature set
Merge branch 'wint-99' of https://github.com/mruckman/git-training into wint-99