add conj1
Merge branch 'master' of github.com:swannodette/mori