Merge branch 'master' of github.com:vladpaunescu/college-2nd

Conflicts:
	nnt/lab02-backprop/backpropagation-net.py