combining files, uncommented hanabi.cpp

there's a bug that makes it crash