test
fixing merge conflict
added embeded youtube video and twitter feed widget to media page
Merge pull request #6 from mikeleejr/media-page

Media page