Merge pull request #14 from DeckOfPandas/content/media

Content/media
Merge remote-tracking branch 'upstream/master' into content/media