added init
merge
Merge branch 'master' of https://github.com/bps10/NeitzModel

* 'master' of https://github.com/bps10/NeitzModel:
  added files to static
  some reorganization
  trivial formatting
README
Merge branch 'master' of https://github.com/bps10/NeitzModel

* 'master' of https://github.com/bps10/NeitzModel:
  removed print statements
  added cone spacing option
merge
option working in color space