notebook
forget the notebook integration
add notebook
I don't know
Merge branch 'master' into gh-pages

Conflicts:
	src/posts/2014/06/markdown.md
test if notebook work