committed
Merge remote-tracking branch 'origin/master'

Conflicts:
	fitting/2D_NN_wModule.py