9.9 added tests for json parser
Merge branch 'master' of github.com:fpinscala-muc/fpinscala

Conflicts:
	exercises/src/main/scala/fpinscala/parsing/JSON.scala