Updated logo
ugh I lied, original logo was better
add flash
fix merge conflict
i dunno
fixed yet another merge conflict