Change to Edition 3 of the tutorial
Merge branch 'master' of https://github.com/AlicJ/first_app