Finished basic shift workflow
Merge branch 'master' into gh-pages