layout and syntax
Merge branch 'master' of https://github.com/TeamCocoDojo/cocodojo