Merge pull request #41 from shayhowe/master

Adding the media object
Misc styles