broken scripts that could be salvaged, but ... LATER :)
1D differential encoding model
moving around figures, small tweaks.  accidentally included some stuff from 2layer... oh well.
Merge pull request #1 from bcipolli/broken_scripts

broken scripts that could be salvaged, but ... LATER :)
Merge pull request #2 from bcipolli/1D

1D differential encoding model scripts
Merge branch 'develop' of github.com:bcipolli/DifferentialEncoding into figures

Conflicts:
	scripts/34x25/testing/twolayer_sergent_sergent.m
Merge pull request #3 from bcipolli/figures

Tweak demo figures; a few commits from the 2layer branch
Merge branch 'develop' of github.com:bcipolli/DifferentialEncoding into COGSCI_2014

Conflicts:
	.gitignore