Merged tsp branch

Merged TSP branch (florin) plus added my algorithms.