Added JSon output.
Merge branch 'master' of https://github.com/walidk/MWRouting

Conflicts:
	src/main/scala/mw/RoutingGame.scala
	src/main/scala/mw/main.scala