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

Conflicts:
	DiplomSolution/DiplomSolution.v12.suo