Revert "Test2"

This reverts commit 50ff80b948cfa8dd54d6571a882e0f3b3fc30263.
Merge branch 'master' of https://github.com/and3k5/mermail