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

Conflicts:
	project_posts/2014-02-02-3-Post.md