Merge branch 'master' of github.com:/usernamestaken/oclHashcat