Correct softmax & more refined safefile
Merge remote-tracking branch 'origin/master'

Conflicts:
	layerbase.py