#2 add an webpage
Merge branch

Conflicts:
	TeamProject Soft/TeamProject
Soft/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache