Merge branch 'deploy'
Django app for Traffic Type sketch
Merge branch 'master-traffictype'
Merge branch 'master' into deploy
Triangles will intermittently flash and fade
Merge branch 'master-traffictype'
Merge branch 'master' into deploy