first draft of final paper
changed test key
Merge branch 'master' of https://github.com/kberger/serpent