logo and tagline
Merge branch 'master' into ChrisRetinaHeader
finalize retina header