Part way through the Swift Tour
Changing a name to try and sort out a conflict on Github
Merge branch 'master' of https://github.com/danielpi/Swift-Playgrounds

Trying to sort out an issue with Github.