Refactored. flip_cities function added
Reworked neighbours variable
Merge branch 'master' into satellite

Conflicts:
	main.c