Implemented sending a wave and image through email
Resolved merge conflicts