checking in bob
Merge branch 'master' of https://github.com/alecmmoore/whitworthmaps

Conflicts:
	WhitworthMap/WhitworthMap.v11.suo
	WhitworthMap/WhitworthMap/MainPage.xaml
	WhitworthMap/WhitworthMap/bin/Debug/AppX/MainPage.xaml
	WhitworthMap/WhitworthMap/bin/Debug/AppX/WhitworthMap.exe
	WhitworthMap/WhitworthMap/bin/Debug/AppX/WhitworthMap.pdb
	WhitworthMap/WhitworthMap/bin/Debug/AppX/microsoft.system.package.metadata/S-1-5-21-1665177248-445778707-3632517881-1001.pckgdep
	WhitworthMap/WhitworthMap/bin/Debug/AppX/vs.appxrecipe
	WhitworthMap/WhitworthMap/bin/Debug/MainPage.xaml
	WhitworthMap/WhitworthMap/bin/Debug/WhitworthMap.build.appxrecipe
	WhitworthMap/WhitworthMap/bin/Debug/WhitworthMap.exe
	WhitworthMap/WhitworthMap/bin/Debug/WhitworthMap.pdb
	WhitworthMap/WhitworthMap/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WhitworthMap/WhitworthMap/obj/Debug/MainPage.g.cs
	WhitworthMap/WhitworthMap/obj/Debug/MainPage.g.i.cs
	WhitworthMap/WhitworthMap/obj/Debug/MainPage.xaml
	WhitworthMap/WhitworthMap/obj/Debug/ProjectArchitectures.txt
	WhitworthMap/WhitworthMap/obj/Debug/WhitworthMap.csproj.FileListAbsolute.txt
	WhitworthMap/WhitworthMap/obj/Debug/WhitworthMap.exe
	WhitworthMap/WhitworthMap/obj/Debug/WhitworthMap.pdb
	WhitworthMap/WhitworthMap/obj/Debug/intermediatexaml/WhitworthMap.exe
	WhitworthMap/WhitworthMap/obj/Debug/intermediatexaml/WhitworthMap.pdb
what