test
first run
Merge remote-tracking branch 'origin/master'

Conflicts:
	MapDataMaper/DataMapers.v11.suo

	MapDataMaper/MapDataMaper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	MapDataMaper/DataMapers.v11.suo

	MapDataMaper/MapDataMaper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
test
Test
test
Remove test
Test Merge
Merge branch 'master' of https://github.com/NEIT-CMAS/CMAS-Main

Conflicts:
	MapDataMaper/DataMapers.v11.suo
CMASExe

Initial Load
Merge remote-tracking branch 'origin/master' into fred

Conflicts:
	MapDataMaper/DataMapers.v11.suo
Merge remote-tracking branch 'origin/master'

Conflicts:
	MapDataMaper/DataMapers.v11.suo
Merge remote-tracking branch 'origin/master'

Conflicts:
	MapDataMaper/DataMapers.v11.suo
Changes with merged solutions
Merge remote-tracking branch 'origin/master' into will

Conflicts:
	CMAS/CMAS.v11.suo