Merge branch 'master' of https://github.com/cindyloo/devart-template

Conflicts:
project_posts/2014-02-13-Artwork.md
mm
nn