Stuff to merge
Again to merge
Merge branch 'master' of https://github.com/Spike121/INB302CapstoneProject

Conflicts:

	CSharpVersion/RecommenderAttacksAnalytics/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	CSharpVersion/RecommenderAttacksAnalytics/obj/x86/Debug/RecommenderAttacksAnalytics.csproj.FileListAbsolute.txt

	CSharpVersion/RecommenderAttacksAnalytics/obj/x86/Debug/RecommenderAttacksAnalytics.csprojResolveAssemblyReference.cache

	CSharpVersion/RecommenderAttacksAnalytics/obj/x86/Debug/RecommenderAttacksAnalytics_MarkupCompile.cache

	CSharpVersion/RecommenderAttacksAnalytics/obj/x86/Debug/RecommenderAttacksAnalytics_MarkupCompile.i.cache

	CSharpVersion/RecommenderAttacksAnalytics/obj/x86/Debug/RecommenderAttacksAnalytics_MarkupCompile.lref
	CSharpVersion/RecommenderAttacksAnalytics/packages.config