Merge branch 'working'

Conflicts:
	SLAMM.v11.suo
	SLAMM/Form1.Designer.cs
	SLAMM/Form1.cs
	SLAMM/Form1.resx
	SLAMM/bin/Debug/SLAMM.exe
	SLAMM/bin/Debug/SLAMM.pdb
	SLAMM/obj/Debug/SLAMM.Form1.resources
	SLAMM/obj/Debug/SLAMM.csproj.GenerateResource.Cache
	SLAMM/obj/Debug/SLAMM.exe
	SLAMM/obj/Debug/SLAMM.pdb