Add a "tutorial", but the sorting is all wonky
Merge branch 'tutorial' into dev
Merge branch 'dev'