Etap 2 Opis
Merge branch 'master' of https://github.com/BlackDragon2/NoweTrendy.git
Network
Merge branch 'master' of https://github.com/BlackDragon2/NoweTrendy.git

Conflicts:
	ConvolutionalNN/ConvolutionalNN/ConvolutionalNN.vcxproj.filters
przygotowania do scalenia