md slide test
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/slide/index.html