merge
Merge branch 'master' of github.com:contingent/shake
fixed parchament