add draft
update draft
update draft
update slides
update draft with some fixes
update slides
Merge branch 'master' into gh-pages

* master:
  update slides
  update draft with some fixes
  update slides
  update draft
  update draft
  add draft

Conflicts:
	index.html