Church teaching intertwines charity and justice