Merge branch 'master' into v1

This commit is contained in:
Sam El-Husseini
2018-05-31 10:07:01 -07:00
6 changed files with 62 additions and 6 deletions

View File

@ -37,7 +37,6 @@ The lesson series includes:
* [Soil Moisture Tester](/courses/ucp-science/soil-moisture)
* [Gravity, Motion and Waves](/courses/ucp-science/gravity)
* [Body Electrical & Waves](/courses/ucp-science/body-electrical)
* Magnetic Forces - Coming soon...
* [Electricity - Battery Tester](/courses/ucp-science/electricity)
The [Science Experiments](https://sites.google.com/view/utahcodingproject/csta/microbit-science-experiments) lesson series is generously provided by the [Utah Coding Project](https://sites.google.com/view/utahcodingproject/home) and is developed by [Carl Lyman](mailto:utahcoding@outlook.com).

View File

@ -73,7 +73,7 @@
"cardType": "package"
}, {
"name": "Sparkfun Gamer:bit",
"url":"pkg/sparkfun/pxt-gamer-bit",
"url":"/pkg/sparkfun/pxt-gamer-bit",
"cardType": "package"
}, {
"name": "Sparkfun Moto:bit",
@ -81,7 +81,7 @@
"cardType": "package"
}, {
"name": "Sparkfun Weather:bit",
"url":"/pkg/sparkfun/pxt-moto-bit",
"url":"/pkg/sparkfun/pxt-weather-bit",
"cardType": "package"
}, {
"name": "Minode Kit",
@ -131,6 +131,10 @@
"name": "SBRICK",
"url":"/pkg/vengit/pxt-sbrick",
"cardType": "package"
}, {
"name": "Annikken Andee",
"url":"/pkg/Annikken/pxt-Andee",
"cardType": "package"
}]
```