Merge remote-tracking branch 'origin/master'

* origin/master:
  added slidify lecture
  rogers reorg
  added slidify lecture
Merge remote-tracking branch 'github/master'

* github/master: