updates
Merge pull request #1 from mmoghadas/octopress-ing

octopress-ing