Added stuff
Merge branch 'master' of https://github.com/tburnett80/Dickaround

Conflicts:
	WindowsFormsApplication1/WindowsFormsApplication1/Form1.cs
Re-added after merge