Merge remote-tracking branch 'refs/remotes/origin/master' into docs

2016-05-11 09:30:54 -07:00
parent b32c14937c 7d0101af25
commit 2f1a7e3896
86 changed files with 1009 additions and 647 deletions
--- a/docs/lessons/beautiful-image/challenges.md
+++ b/docs/lessons/beautiful-image/challenges.md
@ -39,9 +39,9 @@ basic.showLeds(`
    `)
 ```

-* *Run* your code to see if it works as expected.
+* Does your code work as expected?

 ### Challenge 2

-Nice job! Why don't we create a third image that will show after the other two? Remember to add a pause before you create and show the image.
+Nice job! Why don't we create a third image that will show after the other two?