`
Merge branch 'master' of github.com:Frozen2006/shopProject
Merge branch 'master' of github.com:Frozen2006/shopProject into ajaxing
Correcting entities.. Creating ZIP repository
start add auto completing
Merge branch 'ajaxing'

Conflicts:
	TestProject.v11.suo