Merge branch 'master' of https://github.com/KantianaStudentsProjects/RBMDataGenerator_A2014

Conflicts:
	DiplomSolution/DiplomSolution.v12.suo
	DiplomSolution/Regressions/bin/Debug/Regressions.dll
	DiplomSolution/Regressions/bin/Debug/Regressions.pdb
	DiplomSolution/Regressions/bin/Debug/SharedLibrary.dll
	DiplomSolution/Regressions/bin/Debug/SharedLibrary.pdb
	DiplomSolution/Regressions/obj/Debug/Regressions.csprojResolveAssemblyReference.cache
	DiplomSolution/Regressions/obj/Debug/Regressions.dll
	DiplomSolution/Regressions/obj/Debug/Regressions.pdb
	DiplomSolution/SharedLibrary/bin/Debug/SharedLibrary.dll
	DiplomSolution/SharedLibrary/bin/Debug/SharedLibrary.pdb
	DiplomSolution/SharedLibrary/obj/Debug/SharedLibrary.dll
	DiplomSolution/SharedLibrary/obj/Debug/SharedLibrary.pdb
Merge branch 'master' of https://github.com/KantianaStudentsProjects/RBMDataGenerator_A2014

Conflicts:
	DiplomSolution/DiplomSolution.v12.suo
	DiplomSolution/Regressions/bin/Debug/Regressions.dll
	DiplomSolution/Regressions/bin/Debug/Regressions.pdb
	DiplomSolution/Regressions/bin/Debug/SharedLibrary.dll
	DiplomSolution/Regressions/bin/Debug/SharedLibrary.pdb
	DiplomSolution/Regressions/obj/Debug/Regressions.csprojResolveAssemblyReference.cache
	DiplomSolution/Regressions/obj/Debug/Regressions.dll
	DiplomSolution/Regressions/obj/Debug/Regressions.pdb
	DiplomSolution/SharedLibrary/bin/Debug/SharedLibrary.dll
	DiplomSolution/SharedLibrary/bin/Debug/SharedLibrary.pdb
	DiplomSolution/SharedLibrary/obj/Debug/SharedLibrary.dll
	DiplomSolution/SharedLibrary/obj/Debug/SharedLibrary.pdb