Sushi Kanji

More real-world git

Avoiding the fast forward merge.