Resolved minor merge conflict
Merge branch 'master' of https://github.com/maxmcc/dead-simple-encryption