|There's also Spotted Flower which has not be confirmed or denied as a canon to the main universe. I honestly thing is considering how it played out.
Spoiler (mouse over to view)
Makoto and Saki dated. Madarame was in love with Saki. Well, in Genshinken, Makoto treats Saki like crap and that's one of the reasons Madarame fell for her. She also told Madarame that if she wasn't with Makoto, she could see herself being with him. In Spotted Flowers, it's years later and Madarame and Saki have been married a little while after her break up with Makoto and have a child on the way.