qqq
qqqqq
Merge branch 'master' of github.com:Frozen2006/shopProject

Conflicts:
	TestProject.v11.suo