WIP
Merge branch 'master' of github.com:bitdagger/Matasano