making minor changes
Merge branch 'master' of https://github.com/timera/NewChao

Conflicts:
	Chao/Form3.Designer.vb