The two ways that Islam made its way from North Africa to sub-Saharan Africa were ________ and ________.