test
fixing problem with DB
added main page
test
dsf
Merge branch 'master' of https://github.com/xdollarx/CourseWork

Conflicts:
	CourseProj/CourseProj.suo
	CourseProj/CourseProj/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CourseProj/CourseProj/obj/Debug/ResolveAssemblyReference.cache