Updating edge
Merge branch 'gh-pages' of github.com:medialab/artoo into gh-pages