test
trying to fix merge
finally fixed the mail probems! FTW
Merge branch 'master' of https://github.com/marthall/jubileum