[otf: 2] Start feature 2
Merge branch 'develop_nb' of github.com:dstanf/git-demo into develop_nb
Revert "Merge branch 'develop_nb' of github.com:dstanf/git-demo into develop_nb"

This reverts commit c2b82176c2f3406dd0561a6f60b9d581b0b649b7, reversing
changes made to 4e2899e716391599b15be1eec9d4453b10249115.
[otf: 2] Add feature 2 style
Revert "Revert "Merge branch 'develop_nb' of github.com:dstanf/git-demo into develop_nb""

This reverts commit fdc3accc0d22cf47734daf620e67a9631507dd5f.