added some tests and formatted some files
added tests and formatted some things
Merge branch 'beyerpc'

Conflicts:
	Civilization/CivTests/Milestone2Tests.cs
	Civilization/CivTests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Civilization/Civilization.v11.suo
	Civilization/Civilization/bin/Debug/Civilization.exe
	Civilization/Civilization/bin/Debug/Civilization.pdb
	Civilization/Civilization/obj/Debug/Civilization.csproj.GenerateResource.Cache
	Civilization/Civilization/obj/Debug/Civilization.exe
	Civilization/Civilization/obj/Debug/Civilization.pdb
i dont know what will happen here
still dont know what is happening
i dont know whats what anymore.......
merging branches