Conflicts:
	DEVGUIDE.md
	README.md
	appveyor-build.cmd
	appveyor.yml
	src/fsharp/FSharp.Core.Unittests/SurfaceArea.net40.fs
	tests/test.lst