Rock Magic

Signed-off-by: Adam Palmer <ad@palmerama.tv>
Merge branch 'terry-demo-2-rock-race' of https://github.com/RhythmDigital/rhythm-terry into terry-demo-2-rock-race