Merge pull request #8 from zakfu/master

Fixed typo in step 2 of Conditional sections.
Updated promise code in Transitions to match tutorial content.