did some stuff
Merge branch 'master' of https://github.com/UIowa-6K183/Group2_SLPL

Conflicts:
	SLPL.suo
	SLPL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SLPL/obj/Debug/SLPL.dll
	SLPL/obj/Debug/SLPL.pdb
	SLPL/obj/Debug/SLPL.xml