Revert "test2"

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