Documentation

Signed-off-by: Benjamin Mosnier <bm@kappuccino.org>
Merge branch 'master' into gh-pages

Signed-off-by: Benjamin Mosnier <bm@kappuccino.org>

Conflicts:
	README.md