Update conversation
Merge branch 'master' of https://github.com/zhon/angular-hogwarts-tdd-kata