Initial commit
Merged conflicts
Merge branch 'controls' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Remove cue every time it goes to next step (still not completely fixed)