Implemented feature4.
Merge branch 'master' of https://github.com/steinarb/git-demo2