First commit
Merge https://github.com/nirru/MyChurchMate