addl media icons, text updated
Merge branch 'master' of github.com:erichwelz/css_website

Cleaning up merge conflict