Merge branch 'master' into origin/docs

2016-06-01 20:53:46 -07:00
parent d4a55bd53d a3d559c7af
commit 4cba801d78
231 changed files with 2183 additions and 907 deletions
--- a/docs/lessons/beautiful-image/activity.md
+++ b/docs/lessons/beautiful-image/activity.md
@ -4,8 +4,6 @@ Generate and show a beautiful image.

 ### ~avatar avatar

-### @video td/videos/beautiful-image-0
-
 Let's learn how to show an image on the LED screen.

 ### ~
--- a/docs/lessons/beautiful-image/challenges.md
+++ b/docs/lessons/beautiful-image/challenges.md
@ -18,8 +18,6 @@ basic.showLeds(`

 ### Challenge 1

-### @video td/videos/beautiful-image-1-2
-
 Now show an new image that will display on the micro:bit.

 ```blocks