readme

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

Signed-off-by: Benjamin Mosnier <bm@kappuccino.org>
Merge branch 'refs/heads/dev'

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

Conflicts:
	README.md
	package.json