new logo and page design
resolved merge pseudoconflict