Merge remote-tracking branch 'origin/amir' into JEPG
getting cross-entropy training to work, yeah\!
'
fixing SSE gradient
uh oh...
Merge branch 'JEPG' of guru.ucsd.edu:~/DifferentialEncoding into JEPG
latest changes
setting up as generic guru code repository
Merge branch 'develop' of github.com:bcipolli/DifferentialEncoding into JEPG

Conflicts:
	code/lib/emo/emo_backprop.m
	code/lib/emo/emo_nnError.m
	code/lib/emo/emo_trnsfr.m
	code/lib/guru/nn/guru_nnTrain_resilient.m
	code/lib/guru/nn/guru_nnTrain_resilient_homeostatic.m
	scripts/34x25/common_args.m
	scripts/34x25/sergent_1982/uber_sergent_args.m
	scripts/34x25/sergent_1982/uber_sergent_sergent.m
	scripts/34x25/uber_args.m
Merge branch 'develop' of github.com:bcipolli/DifferentialEncoding into JEPG
Merge branch 'develop' of github.com:bcipolli/DifferentialEncoding into JEPG

Conflicts:
	code/analyze/ac/plots/de_PlotDistributions.m
	code/analyze/ac/stats/de_StatsDistributions.m
	code/lib/guru/guru_getfield.m
	code/lib/guru/nn/guru_nnTrain_resilient.m
	code/lib/guru/nn/guru_nnTrain_resilient_homeostatic.m
	scripts/34x25/common_args.m
	scripts/34x25/uber_args.m
Saving current parameters, small bugfixes
Merge pull request #7 from bcipolli/JEPG

Updates for the JEPG paper draft