updated index
merged
fixed merge error
merger with master; Updated to reflect new why us section; Updated master colors and icons;