readme

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
Refactoring bug fix

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

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