sada
sd
 d
Merge branch 'master' of https://github.com/sunallen521/KaoAkao

Conflicts:
	KaoAKao2.0.v11.suo
filldata
Merge branch 'master' of https://github.com/sunallen521/KaoAkao

Conflicts:
	KaoAKao.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KaoAKao.DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KaoAKao.Entity/Courses/CourseEntity.cs
	KaoAKao.Entity/Users/UserEntity.cs
	KaoAKao2.0.Web/obj/Debug/KaoAKao.Web.csproj.FileListAbsolute.txt
	KaoAKao2.0.v11.suo
	KaoAKao2.0.v11.suo.orig