completed chapter about demos
merged remote branch and solved merge conflict