Iteration 1: story 1 and 2
Merge branch 'master' of https://github.com/szczepiq/cbe.git