Learn Hardcore Japanese: kinou tomodati to kenkasita ato, meeru de nakanaorisimasita. - After I fought with my friend yesterday, we made up by email.