I'm trying to commit something
Merge with cache files. We really should add these to .gitignore
Merge branch 'master' of https://github.com/Fynze/ProjectCorePhase

Conflicts:
	StreetLightSimulator/StreetLightSimulator.v11.suo
	StreetLightSimulator/StreetLightSimulator/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	StreetLightSimulator/StreetLightSimulator/obj/Debug/StreetLightSimulator.csproj.FileListAbsolute.txt
	StreetLightSimulator/StreetLightSimulator/obj/Debug/StreetLightSimulator.csproj.GenerateResource.Cache
	StreetLightSimulator/StreetLightSimulator/obj/Debug/StreetLightSimulator.csprojResolveAssemblyReference.cache