1b) Added Dijkstra
Merge branch 'master' into Lab_04
Merge branch 'master' into local