Added Task1 wrapper to drive the Tour class, a copy of this for Task2 and fixed references in Task 2 files to Task 1