errors on diff?
Merge branch 'master' into error
converted to the current json
rewrote the backend to support actions
Merge branch 'error'

Conflicts:
	src/test/scala/code/ParserSpec.scala