Ah thats awesome, schooltrip to Japan sounds like the ultimate schooltrip. I'm living in Kyoto right now studying Japanese, have been to Hiroshima as well, saving Tokyo for later though. Did you go to the island Miyajima while in Hiroshima? It's a pretty awesome spot, definitely a spot i wanna visit again. Maybe even in a dream when i manage to have a lucid one!
Saving the war stories for later, i don't wanna bore you guys already^^