update
Merge branch 'master' of https://github.com/StephenStrickland/TVA

Conflicts:
	WindowsFormsApplicationTVA/WindowsFormsApplicationTVA/Form1.Designer.cs