testing changes for media
Merge branch 'gh-pages' of https://github.com/nevvkid/starter into gh-pages