a
gjhgj
Merge branch 'master' into Bug2

Conflicts:
	WindowsApplication1/WindowsApplication1.v11.suo
yuyu
dd
v
d
Merge branch 'Bug4'

Conflicts:
	WindowsApplication1/WindowsApplication1/Form1.vb
f
f
Merge branch 'Branch6'