Getting branch up to date
Merge branch 'develop' of https://github.com/githubschool/example-basic into develop