added butler lies
added butler lies
merging in laura's changes

Merge branch 'master' of github.com:sociam/DEFChapter-Obfuscation