commit before pull
fixing merge conflicts
add articles
Merge pull request #14 from mcclungt/partials-layout

Partials layout