.
Merge branch 'master' of https://github.com/patryk1992/KurierPlanowanieTrasy

Conflicts:
	.project
	src/shortest_path/Dijkstra.java