update from https
Merge branch 'master' of https://github.com/andrewintw/sitcon-workshop
Merge branch 'master' of https://github.com/andrewintw/sitcon-workshop