olololo
olololo
Merge branch 'master' of https://github.com/NixonWatt/Pohui

Conflicts:
	Pohui/Pohui.Tests/bin/Debug/Pohui.Tests.dll
	Pohui/Pohui.Tests/bin/Debug/Pohui.Tests.pdb
	Pohui/Pohui.Tests/bin/Debug/Pohui.dll
	Pohui/Pohui.Tests/bin/Debug/Pohui.pdb
	Pohui/Pohui.Tests/obj/Debug/Pohui.Tests.csprojResolveAssemblyReference.cache
	Pohui/Pohui.Tests/obj/Debug/Pohui.Tests.dll
	Pohui/Pohui.Tests/obj/Debug/Pohui.Tests.pdb
	Pohui/Pohui.v11.suo
	Pohui/Pohui/App_Data/aspnet-Pohui-20131121222748.mdf
	Pohui/Pohui/App_Data/aspnet-Pohui-20131121222748_log.ldf
	Pohui/Pohui/bin/Pohui.dll
	Pohui/Pohui/bin/Pohui.pdb
	Pohui/Pohui/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Pohui/Pohui/obj/Debug/Pohui.csproj.FileListAbsolute.txt
	Pohui/Pohui/obj/Debug/Pohui.csproj.GenerateResource.Cache
	Pohui/Pohui/obj/Debug/Pohui.dll
	Pohui/Pohui/obj/Debug/Pohui.pdb
	Pohui/Pohui/obj/Debug/TempPE/App_LocalResources.Resource.Designer.cs.dll