header, footer, colors, testimonials

moved logo in header and footer; changed colors in welcome box, adds;
created margins in testimonials.
Merge remote-tracking branch 'origin/master'

Conflicts:
	style.css