merging conflit
Merge branch 'master' of git://github.com/dfink/systematics
add theta.ps