commit pod merge
Merge remote-tracking branch 'origin/Algorytm-prowadzenia-Gry'

Conflicts:
	Scotland_Yard/map.cpp

git commit