lisavogtsf/awesome_blog — pull request #25 by indotek68 (2014-08-24 21:43:18+00:00)
Title: Resolve merge conflict

Resolve merge conflict