12pt
Merge branch 'master' of github.com:aczid/cloud_privacy
Rewrote a lot of things...