Merge branch 'bar' into myfork/master

Conflicts:
	src/main/scala/nl/tudelft/courses/in4355/github_relations_viz/GHRelationsVizDist.scala
	src/main/scala/nl/tudelft/courses/in4355/github_relations_viz/GHRelationsVizServlet.scala
	src/main/scala/nl/tudelft/courses/in4355/github_relations_viz/actors/ActorOp.scala
	src/main/scala/nl/tudelft/courses/in4355/github_relations_viz/actors/LinkCombinerActor.scala
Merge branch 'master' of github.com:gousiosg/github-relations-viz