Merge pull request #1 from Ecotrust/gh-pages

Captions
Updated 2013-05-03-the-return-of-the-medeek.md
Merge pull request #5 from EmmaDeans/gh-pages

merge emma