got the main window to close
Merge branch 'connecting_map' of https://github.com/paulbatley/Advanced_CPP_FA14 into connecting_map