next
Merge branch 'cards'

Conflicts:

app/src/main/java/lmu/appnight/PersonKoExplanation/PersonKoExplanationAc
tivity.java