Merge branch 'hotfix/post_welcome_mezzomo_text_fixes'
Merge branch 'develop' of github.com:startae/startae-blog
Add blog post image. update text
Merge branch 'master' of github.com:startae/startae-blog into develop

Conflicts:
	source/2014-06-25-estamos-contratando-rails-developer.slim
header update