added encryption
Merge branch 'master' of https://github.com/paulrogofsky/Flock