a
Merge branch 'master' of https://github.com/pawelrychly/algorytmy-inspirowane-biologicznie

Conflicts:
	atsp/src/atsp.cpp
	atsp/src/res/Greedy
	atsp/src/res/NearestNeighbor
	atsp/src/res/Random
	atsp/src/res/RandomWalker
	atsp/src/res/Steepest
randoms