modify notebook
revised markdon
Merge branch 'master' into gh-pages

Conflicts:
	src/posts/2014/06/markdown.md