flashes added
resolved merge conflicts
resolving merge conflicts pt 2
fixed merge conflicts
Merge pull request #21 from mkirlin/sun_bass

Sun bass