NN with satellite list
working NN for satellite list
commented out neighbour
Merge branch 'master' into satellite

Conflicts:
	main.c
commented out neighbour, broken for now
Started working on the report
Merge branch 'satellite' of github.com:MGM-KTH/travelguide into satellite
almost 2-opt
Merge branch 'satellite' of https://github.com/MGM-KTH/travelguide into satellite
might have fixed it
2-opt working! rand disabled for testing purposes
added timer to wait 1.9s, then abort
Integrated 2.5-opt with satellite list
removed old stuff + rename
Merge branch 'satellite' of https://github.com/MGM-KTH/travelguide into satellite

Conflicts:
	main.c
fixed faulty commit
Implemented neighbour list for NN and 2.5-opt
merge
fixed merge issue
Added some collaboration text